diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index f97cbe4b99..07ead107df 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -629,12 +629,12 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the
 
 .spinbutton {
   .button {
+    @include entry(normal);
     background-image: none;
     border-width: 0 0 0 1px;
     border-color: transparentize($borders_color,0.7);
     color: mix($fg_color,$base_color,95%);
     border-radius: 0;
-    box-shadow: none;
   //  padding-left: 6px;
   //  padding-right: 6px;
     &:dir(rtl) { border-width: 0 1px 0 0; }
@@ -643,6 +643,7 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the
       background-color: transparentize(black,0.95);
     }
     &:insensitive {
+      box-shadow: none;
       color: transparentize($insensitive_fg_color,0.7);
     }
     &:active {
@@ -651,9 +652,11 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the
     }
     &:backdrop {
       border-color: transparentize($backdrop_borders_color,0.7);
+      background-color: $bg_color;
+      box-shadow: none;
     }
     &:backdrop:insensitive {
-      background-image: none;
+      box-shadow: none;
       color: transparentize($insensitive_fg_color,0.7);
       border-width: 0 0 0 1px; // It is needed or it gets overridden
       &:dir(rtl) { border-width: 0 1px 0 0; }
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index 0b7435d162..6152865691 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -831,26 +831,34 @@ GtkColorButton.button {
    * }
    */ }
   .spinbutton .button {
+    background-color: transparent;
+    border-style: solid;
+    border-width: 1px;
+    background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #7f7f7f;
     background-image: none;
     border-width: 0 0 0 1px;
     border-color: rgba(127, 127, 127, 0.3);
     color: #0c0c0c;
-    border-radius: 0;
-    box-shadow: none; }
+    border-radius: 0; }
     .spinbutton .button:dir(rtl) {
       border-width: 0 1px 0 0; }
     .spinbutton .button:hover {
       color: #000;
       background-color: rgba(0, 0, 0, 0.05); }
     .spinbutton .button:insensitive {
+      box-shadow: none;
       color: rgba(127, 127, 127, 0.3); }
     .spinbutton .button:active {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     .spinbutton .button:backdrop {
-      border-color: rgba(139, 139, 139, 0.3); }
+      border-color: rgba(139, 139, 139, 0.3);
+      background-color: #fff;
+      box-shadow: none; }
     .spinbutton .button:backdrop:insensitive {
-      background-image: none;
+      box-shadow: none;
       color: rgba(127, 127, 127, 0.3);
       border-width: 0 0 0 1px; }
       .spinbutton .button:backdrop:insensitive:dir(rtl) {