diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 55be007..199c673 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -35,20 +35,26 @@
 spinbutton:not(.vertical),
 entry {
   min-height: 32px;
-  padding-left: 8px;
-  padding-right: 8px;
-  border: 1px solid;
+
+  border: 1px solid @theme_bg_color_breeze;
   border-radius: 5px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: @theme_text_color_breeze;
-  border-color: @border_color;
   background-color: @theme_base_color_breeze;
   /*box-shadow: inset 0 0 0 1px rgba(42, 145, 250, 0);*/
   box-shadow: inset 0 4px 3px 0px alpha(black,0.5),
-                /*0 -1px 1px 0 alpha(black, 0.7),*/
-              0 1px 1px 0 @highlight_color;
+              inset 0 1px 1px 0 alpha(black, 0.7),
+              inset 0 -1px 1px 0 @highlight_color;
    }
-  
+spinbutton:not(.vertical):dir(ltr) {
+        padding-left: 8px;
+        padding-right: 0px;
+}  
+spinbutton:not(.vertical):dir(rtl) {
+        padding-left: 0px;
+        padding-right: 8px;
+}  
+
 
 /***********
  * Buttons *
diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
index 44df0aa..3ddd94b 100755
--- a/gtk-4.0/gtk.css
+++ b/gtk-4.0/gtk.css
@@ -76,13 +76,10 @@ spinbutton:not(.vertical),
 spinbutton.vertical text,
 entry {
   min-height: 32px;
-  padding-left: 8px;
-  padding-right: 8px;
-  border: 1px solid;
+  border: 1px solid @theme_bg_color_breeze;
   border-radius: 5px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: @theme_text_color_breeze;
-  border-color: @border_color;
   background-color: @theme_base_color_breeze;
   /*box-shadow: inset 0 0 0 1px rgba(42, 145, 250, 0);*/
   box-shadow: inset 0 4px 3px 0px alpha(black,0.5),
@@ -90,6 +87,18 @@ entry {
               0 1px 1px 0 @highlight_color;
    }
   
+spinbutton:not(.vertical):dir(ltr) {
+        padding-left: 8px;
+        padding-right: 0px;
+}  
+spinbutton:not(.vertical):dir(rtl) {
+        padding-left: 0px;
+        padding-right: 8px;
+}  
+spinbutton.vertical text {
+        padding-left: 8px;
+        padding-right: 8px;
+}
 
 /***********
  * Buttons *
diff --git a/gtk-common/common.css b/gtk-common/common.css
index 1348c41..5fac6b4 100644
--- a/gtk-common/common.css
+++ b/gtk-common/common.css
@@ -306,6 +306,11 @@ spinner {
 /****************
  * Text Entries *
  ****************/
+ 
+entry {
+  padding-left: 8px;
+  padding-right: 8px;
+}
 
 spinbutton:not(.vertical) image.left,
   entry image.left {
@@ -414,8 +419,7 @@ background-color: @theme_base_color_breeze;
   entry:drop(active) {
     border-color: @success_color_breeze;
     box-shadow: inset 0 0 0 1px @success_color_breeze; }
-  .osd spinbutton:not(.vertical), .osd
-  entry {
+  .osd spinbutton:not(.vertical), .osd entry {
     color: white;
     border-color: alpha(black, 0.7);
     background-color: alpha(black, 0.5);
@@ -423,8 +427,7 @@ background-color: @theme_base_color_breeze;
     box-shadow: none;
     /*text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black; */}
-    .osd spinbutton:focus:not(.vertical), .osd
-    entry:focus {
+    .osd spinbutton:focus:not(.vertical), .osd entry:focus {
       color: white;
       border-color: @theme_selected_bg_color_breeze;
       background-color: alpha(black, 0.5);
@@ -441,8 +444,7 @@ background-color: @theme_base_color_breeze;
       box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }*/
-    .osd spinbutton:disabled:not(.vertical), .osd
-    entry:disabled {
+    .osd spinbutton:disabled:not(.vertical), .osd entry:disabled {
       color: @theme_disabled_fg_color;
       border-color: alpha(@theme_disabled_fg_color, 0.7);
       background-color: @insensitive_base_color_breeze; /*rgba(49, 52, 52, 0.5);*/
@@ -2215,17 +2217,17 @@ menubar,
   .menubar:backdrop {
     background-color: @theme_bg_color_breeze; }
   menubar > menuitem,
-  .menubar > menuitem {
+  .menubar > menuitem, menubar > item {
     min-height: 16px;
     padding: 4px 8px; }
     menubar > menuitem:hover,
-    .menubar > menuitem:hover {
+    .menubar > menuitem:hover, , menubar > item:hover {
       box-shadow: inset 0 -3px @theme_selected_bg_color_breeze;
       background-color: @theme_selected_bg_color_breeze;
       color: @theme_selected_fg_color_breeze;
     /*text-shadow: 0px 1px alpha(black, 0.6); */}
     menubar > menuitem:disabled,
-    .menubar > menuitem:disabled {
+    .menubar > menuitem:disabled, menubar > item:disabled {
       color: @theme_disabled_fg_color;
       box-shadow: none; }