7 files changed, 50 insertions, 30 deletions
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 1e07c48..c4f9e82 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -739,10 +739,9 @@ spinbutton button:active {
 spinbutton:disabled {
   color: rgba(211, 218, 227, 0.45); }
 
-spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
-  padding-top: 0;
-  padding-bottom: 0;
-  min-height: 0; }
+spinbutton:not(.vertical):dir(ltr) entry,
+spinbutton:not(.vertical):dir(rtl) button.up {
+  border-radius: 3px 0 0 3px; }
 
 spinbutton:not(.vertical) > button + button {
   border-left-style: none; }
@@ -752,6 +751,7 @@ spinbutton:not(.vertical) > button:hover + button {
   box-shadow: inset 1px 0 #2b2e39; }
 
 spinbutton:not(.vertical) > button:first-child:hover:not(:active),
+spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
 spinbutton:not(.vertical) > entry + button:not(:active):hover {
   box-shadow: none; }
 
@@ -763,6 +763,9 @@ spinbutton.vertical button, spinbutton.vertical entry {
   padding-right: 4px;
   min-width: 0; }
 
+spinbutton.vertical button.up {
+  border-radius: 3px 3px 0 0; }
+
 spinbutton.vertical > entry:focus + button {
   border-top-color: #2b2e39; }
 
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 00dc464..ad88065 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -738,10 +738,9 @@ spinbutton button:active {
 spinbutton:disabled {
   color: rgba(92, 97, 108, 0.55); }
 
-spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
-  padding-top: 0;
-  padding-bottom: 0;
-  min-height: 0; }
+spinbutton:not(.vertical):dir(ltr) entry,
+spinbutton:not(.vertical):dir(rtl) button.up {
+  border-radius: 3px 0 0 3px; }
 
 spinbutton:not(.vertical) > button + button {
   border-left-style: none; }
@@ -751,6 +750,7 @@ spinbutton:not(.vertical) > button:hover + button {
   box-shadow: inset 1px 0 #cfd6e6; }
 
 spinbutton:not(.vertical) > button:first-child:hover:not(:active),
+spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
 spinbutton:not(.vertical) > entry + button:not(:active):hover {
   box-shadow: none; }
 
@@ -762,6 +762,9 @@ spinbutton.vertical button, spinbutton.vertical entry {
   padding-right: 4px;
   min-width: 0; }
 
+spinbutton.vertical button.up {
+  border-radius: 3px 3px 0 0; }
+
 spinbutton.vertical > entry:focus + button {
   border-top-color: #5294E2; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 7671bf3..20fb194 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -739,10 +739,9 @@ spinbutton button:active {
 spinbutton:disabled {
   color: rgba(211, 218, 227, 0.45); }
 
-spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
-  padding-top: 0;
-  padding-bottom: 0;
-  min-height: 0; }
+spinbutton:not(.vertical):dir(ltr) entry,
+spinbutton:not(.vertical):dir(rtl) button.up {
+  border-radius: 3px 0 0 3px; }
 
 spinbutton:not(.vertical) > button + button {
   border-left-style: none; }
@@ -752,6 +751,7 @@ spinbutton:not(.vertical) > button:hover + button {
   box-shadow: inset 1px 0 #2b2e39; }
 
 spinbutton:not(.vertical) > button:first-child:hover:not(:active),
+spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
 spinbutton:not(.vertical) > entry + button:not(:active):hover {
   box-shadow: none; }
 
@@ -763,6 +763,9 @@ spinbutton.vertical button, spinbutton.vertical entry {
   padding-right: 4px;
   min-width: 0; }
 
+spinbutton.vertical button.up {
+  border-radius: 3px 3px 0 0; }
+
 spinbutton.vertical > entry:focus + button {
   border-top-color: #2b2e39; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 250f875..ad518c2 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -738,10 +738,9 @@ spinbutton button:active {
 spinbutton:disabled {
   color: rgba(92, 97, 108, 0.55); }
 
-spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
-  padding-top: 0;
-  padding-bottom: 0;
-  min-height: 0; }
+spinbutton:not(.vertical):dir(ltr) entry,
+spinbutton:not(.vertical):dir(rtl) button.up {
+  border-radius: 3px 0 0 3px; }
 
 spinbutton:not(.vertical) > button + button {
   border-left-style: none; }
@@ -751,6 +750,7 @@ spinbutton:not(.vertical) > button:hover + button {
   box-shadow: inset 1px 0 #cfd6e6; }
 
 spinbutton:not(.vertical) > button:first-child:hover:not(:active),
+spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
 spinbutton:not(.vertical) > entry + button:not(:active):hover {
   box-shadow: none; }
 
@@ -762,6 +762,9 @@ spinbutton.vertical button, spinbutton.vertical entry {
   padding-right: 4px;
   min-width: 0; }
 
+spinbutton.vertical button.up {
+  border-radius: 3px 3px 0 0; }
+
 spinbutton.vertical > entry:focus + button {
   border-top-color: #5294E2; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index bbe9836..a4a1e20 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -738,10 +738,9 @@ spinbutton button:active {
 spinbutton:disabled {
   color: rgba(92, 97, 108, 0.55); }
 
-spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
-  padding-top: 0;
-  padding-bottom: 0;
-  min-height: 0; }
+spinbutton:not(.vertical):dir(ltr) entry,
+spinbutton:not(.vertical):dir(rtl) button.up {
+  border-radius: 3px 0 0 3px; }
 
 spinbutton:not(.vertical) > button + button {
   border-left-style: none; }
@@ -751,6 +750,7 @@ spinbutton:not(.vertical) > button:hover + button {
   box-shadow: inset 1px 0 #cfd6e6; }
 
 spinbutton:not(.vertical) > button:first-child:hover:not(:active),
+spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
 spinbutton:not(.vertical) > entry + button:not(:active):hover {
   box-shadow: none; }
 
@@ -762,6 +762,9 @@ spinbutton.vertical button, spinbutton.vertical entry {
   padding-right: 4px;
   min-width: 0; }
 
+spinbutton.vertical button.up {
+  border-radius: 3px 3px 0 0; }
+
 spinbutton.vertical > entry:focus + button {
   border-top-color: #5294E2; }
 
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index d747a20..ea80786 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -738,10 +738,9 @@ spinbutton button:active {
 spinbutton:disabled {
   color: rgba(92, 97, 108, 0.55); }
 
-spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
-  padding-top: 0;
-  padding-bottom: 0;
-  min-height: 0; }
+spinbutton:not(.vertical):dir(ltr) entry,
+spinbutton:not(.vertical):dir(rtl) button.up {
+  border-radius: 3px 0 0 3px; }
 
 spinbutton:not(.vertical) > button + button {
   border-left-style: none; }
@@ -751,6 +750,7 @@ spinbutton:not(.vertical) > button:hover + button {
   box-shadow: inset 1px 0 #cfd6e6; }
 
 spinbutton:not(.vertical) > button:first-child:hover:not(:active),
+spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
 spinbutton:not(.vertical) > entry + button:not(:active):hover {
   box-shadow: none; }
 
@@ -762,6 +762,9 @@ spinbutton.vertical button, spinbutton.vertical entry {
   padding-right: 4px;
   min-width: 0; }
 
+spinbutton.vertical button.up {
+  border-radius: 3px 3px 0 0; }
+
 spinbutton.vertical > entry:focus + button {
   border-top-color: #5294E2; }
 
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 0f57cdb..d901b99 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -743,19 +743,18 @@ spinbutton {
   &:disabled { color: $insensitive_fg_color; }
 
   &:not(.vertical) {
-    button, entry {
-      padding-top: 0;
-      padding-bottom: 0;
-      min-height: 0;
+    button, entry { @extend %linked; }
+
+    &:dir(ltr) entry,
+    &:dir(rtl) button.up { border-radius: 3px 0 0 3px; }
 
-      @extend %linked;
-    }
     > button + button { border-left-style: none; }
 
     > button:hover:not(:active),
     > button:hover + button { box-shadow: inset 1px 0 $button_border; }
 
     > button:first-child:hover:not(:active),
+    > button.up:dir(rtl):hover:not(:active),
     > entry + button:not(:active):hover { box-shadow: none; }
 
     > entry:focus + button { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
@@ -768,6 +767,9 @@ spinbutton {
 
       @extend %linked_vertical;
     }
+
+    button.up { border-radius: 3px 3px 0 0; }
+
     > entry:focus + button { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
   }
 }