diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 29435c2..b0f0fc1 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1051,11 +1051,6 @@ spinbutton {
  * ComboBoxes *
  **************/
 combobox {
-  > button.combo {
-      padding-left: 8px;
-      padding-right: 8px;
-    }
-
   @include _button_text_shadow;
 
   &:disabled {
@@ -1079,7 +1074,9 @@ combobox {
   }
 
   menuitem { text-shadow: none; }
-  > entry.combo {
+
+/*
+  &.linked > entry.combo {
     &:dir(ltr) {
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;
@@ -1091,7 +1088,7 @@ combobox {
     }
   }
 
-  > button.combo:not(:only-child) {
+  &.linked > button.combo {
     &:dir(ltr) {
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
@@ -1104,10 +1101,19 @@ combobox {
       border-right-style: none;
     }
   }
+*/
+
+  &.linked {
+    button:nth-child(2) {
+      &:dir(ltr) { @extend %linked:last-child; }
+      &:dir(rtl) { @extend %linked:first-child; }
+    }
+  }
+
 }
 
 .linked > combobox > button.combo {
-  // the combo is a composite widget so the way we do button linkind doesn't
+  // the combo is a composite widget so the way we do button linking doesn't
   // work, special case needed. See
   // https://bugzilla.gnome.org/show_bug.cgi?id=733979
 
@@ -1115,9 +1121,9 @@ combobox {
   &:dir(rtl) { @extend %linked_middle; } // specificity bump
 }
 
-.linked > combobox:first-child > button.combo { @extend %linked:first-child; }
-.linked > combobox:last-child > button.combo { @extend %linked:last-child; }
-.linked > combobox:only-child > button.combo { @extend %linked:only-child; }
+.linked:not(.vertical) > combobox:first-child > button.combo { @extend %linked:first-child; }
+.linked:not(.vertical) > combobox:last-child > button.combo { @extend %linked:last-child; }
+.linked:not(.vertical) > combobox:only-child > button.combo { @extend %linked:only-child; }
 
 .linked.vertical > combobox > button.combo { @extend %linked_vertical_middle; }
 .linked.vertical > combobox:first-child > button.combo { @extend %linked_vertical:first-child;}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 11c50c9..de59cb0 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1127,7 +1127,7 @@ searchbar.inline-toolbar toolbutton:backdrop:first-child > button.sidebar-button
 .inline-toolbar headerbar toolbutton:backdrop:first-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:first-child > button.titlebutton,
-.titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, .linked > combobox:first-child > button.combo {
+.titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
@@ -1147,7 +1147,7 @@ searchbar.inline-toolbar toolbutton:backdrop:last-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:last-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:last-child > button.titlebutton,
-.titlebar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton, .linked > combobox:last-child > button.combo {
+.titlebar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
@@ -1168,7 +1168,7 @@ searchbar.inline-toolbar toolbutton:backdrop:only-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:only-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:only-child > button.titlebutton,
-.titlebar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton, .linked > combobox:only-child > button.combo {
+.titlebar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton, .linked:not(.vertical) > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1527,11 +1527,34 @@ treeview spinbutton spinbutton:focus {
  **************/
 combobox {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-  -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
-  combobox > button.combo, headerbar combobox > button.combo.titlebutton,
-  .titlebar combobox > button.combo.titlebutton {
-    padding-left: 8px;
-    padding-right: 8px; }
+  -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+  /*
+    &.linked > entry.combo {
+      &:dir(ltr) {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+      }
+  
+      &:dir(rtl) {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+      }
+    }
+  
+    &.linked > button.combo {
+      &:dir(ltr) {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        border-left-style: none;
+      }
+  
+      &:dir(rtl) {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        border-right-style: none;
+      }
+    }
+  */ }
   combobox:disabled {
     color: #949796;
     text-shadow: none;
@@ -1548,22 +1571,6 @@ combobox {
     min-width: 16px; }
   combobox menuitem {
     text-shadow: none; }
-  combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0; }
-  combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0; }
-  combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left-style: none; }
-  combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-right-style: none; }
 
 /************
  * Toolbars *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index cdeda15..601083b 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1127,7 +1127,7 @@ searchbar.inline-toolbar toolbutton:backdrop:first-child > button.sidebar-button
 .inline-toolbar headerbar toolbutton:backdrop:first-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:first-child > button.titlebutton,
-.titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, .linked > combobox:first-child > button.combo {
+.titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
@@ -1147,7 +1147,7 @@ searchbar.inline-toolbar toolbutton:backdrop:last-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:last-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:last-child > button.titlebutton,
-.titlebar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton, .linked > combobox:last-child > button.combo {
+.titlebar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
@@ -1168,7 +1168,7 @@ searchbar.inline-toolbar toolbutton:backdrop:only-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:only-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:only-child > button.titlebutton,
-.titlebar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton, .linked > combobox:only-child > button.combo {
+.titlebar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton, .linked:not(.vertical) > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1531,11 +1531,34 @@ treeview spinbutton spinbutton:focus {
  **************/
 combobox {
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-  -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
-  combobox > button.combo, headerbar combobox > button.combo.titlebutton,
-  .titlebar combobox > button.combo.titlebutton {
-    padding-left: 8px;
-    padding-right: 8px; }
+  -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+  /*
+    &.linked > entry.combo {
+      &:dir(ltr) {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+      }
+  
+      &:dir(rtl) {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+      }
+    }
+  
+    &.linked > button.combo {
+      &:dir(ltr) {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        border-left-style: none;
+      }
+  
+      &:dir(rtl) {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        border-right-style: none;
+      }
+    }
+  */ }
   combobox:disabled {
     color: #8b8e8f;
     text-shadow: none;
@@ -1552,22 +1575,6 @@ combobox {
     min-width: 16px; }
   combobox menuitem {
     text-shadow: none; }
-  combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0; }
-  combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0; }
-  combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left-style: none; }
-  combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-right-style: none; }
 
 /************
  * Toolbars *
