diff --git a/src/gtk-3.0/assets.svg b/src/gtk-3.0/assets.svg
index b1fbd7f..b10db88 100644
--- a/src/gtk-3.0/assets.svg
+++ b/src/gtk-3.0/assets.svg
@@ -724,9 +724,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="186.36802"
-     inkscape:cy="112.81211"
+     inkscape:zoom="11.313708"
+     inkscape:cx="106.91356"
+     inkscape:cy="195.32311"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -840,6 +840,15 @@
        id="rect1630"
        style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39311957;marker:none;enable-background:accumulate"
        transform="scale(1,-1)" />
+    <rect
+       style="display:inline;opacity:1;fill:#0e6bff;fill-opacity:1;stroke:none;stroke-width:0.88817805;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect1633"
+       width="27.5"
+       height="30"
+       x="79.25"
+       y="-223.57698"
+       rx="0"
+       ry="2.9999974" />
   </g>
   <g
      inkscape:label="assets"
@@ -4261,53 +4270,6 @@
        style="opacity:0.1;fill:#000000;filter:url(#filter1675)"
        transform="translate(-127.90485,-6.7441052)"
        id="g852" />
-    <g
-       id="combobox-arrow"
-       inkscape:label="#g1755">
-      <rect
-         y="-220.45563"
-         x="82.105652"
-         height="28"
-         width="16"
-         id="rect1623"
-         style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.17660701;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
-      <g
-         transform="translate(0,-2.2627383)"
-         id="g1747">
-        <path
-           sodipodi:nodetypes="cccccccc"
-           stroke-miterlimit="4"
-           d="m 89.77936,-211.65688 -4.56806,4.28256 c 0,0 0,1.22359 1.30937,1.21929 l 3.58498,-3.66646 3.58919,3.67076 C 95,-206.15073 95,-207.37432 95,-207.37432 l -4.56806,-4.28256 c 0,0 -0.32629,-0.30589 -0.65258,0 z"
-           id="path1695"
-           inkscape:connector-curvature="0"
-           style="opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.67076564;stroke-miterlimit:4;filter:url(#filter1731)"
-           clip-path="none" />
-        <path
-           clip-path="none"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.67076564;stroke-miterlimit:4"
-           inkscape:connector-curvature="0"
-           id="path1492"
-           d="m 89.77936,-212.10821 -4.56806,4.28256 c 0,0 0,1.22359 1.30937,1.21929 l 3.58498,-3.66646 3.58919,3.67076 C 95,-206.60206 95,-207.82565 95,-207.82565 l -4.56806,-4.28256 c 0,0 -0.32629,-0.30589 -0.65258,0 z"
-           stroke-miterlimit="4"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           clip-path="none"
-           style="opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.67076564;stroke-miterlimit:4;filter:url(#filter1735)"
-           inkscape:connector-curvature="0"
-           id="path1697"
-           d="m 89.77936,-196.72739 -4.56806,-4.28256 c 0,0 0,-1.22359 1.30937,-1.21929 l 3.58498,3.66646 3.58919,-3.67076 c 1.30516,0 1.30516,1.22359 1.30516,1.22359 l -4.56806,4.28256 c 0,0 -0.32629,0.30589 -0.65258,0 z"
-           stroke-miterlimit="4"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           stroke-miterlimit="4"
-           d="m 89.77936,-197.17872 -4.56806,-4.28256 c 0,0 0,-1.22359 1.30937,-1.21929 l 3.58498,3.66646 3.58919,-3.67076 c 1.30516,0 1.30516,1.22359 1.30516,1.22359 l -4.56806,4.28256 c 0,0 -0.32629,0.30589 -0.65258,0 z"
-           id="path1621"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.67076564;stroke-miterlimit:4"
-           clip-path="none" />
-      </g>
-    </g>
     <g
        style="enable-background:new"
        id="titlebutton-close"
@@ -4666,5 +4628,52 @@
            sodipodi:nodetypes="csscc" />
       </g>
     </g>
+    <g
+       id="combobox-arrow"
+       inkscape:label="#g5351">
+      <rect
+         y="-221.94476"
+         x="83"
+         height="28"
+         width="20"
+         id="rect1623"
+         style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.31548667;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
+      <g
+         transform="matrix(1.1178361,0,0,1.1178361,-7.7233473,20.309421)"
+         id="g1747">
+        <path
+           sodipodi:nodetypes="cccccccc"
+           stroke-miterlimit="4"
+           d="m 89.77936,-211.65688 -4.56806,4.28256 c 0,0 0,1.22359 1.30937,1.21929 l 3.58498,-3.66646 3.58919,3.67076 C 95,-206.15073 95,-207.37432 95,-207.37432 l -4.56806,-4.28256 c 0,0 -0.32629,-0.30589 -0.65258,0 z"
+           id="path1695"
+           inkscape:connector-curvature="0"
+           style="opacity:0.45;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.67076564;stroke-miterlimit:4;filter:url(#filter1731)"
+           clip-path="none" />
+        <path
+           clip-path="none"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.67076564;stroke-miterlimit:4"
+           inkscape:connector-curvature="0"
+           id="path1492"
+           d="m 89.77936,-212.10821 -4.56806,4.28256 c 0,0 0,1.22359 1.30937,1.21929 l 3.58498,-3.66646 3.58919,3.67076 C 95,-206.60206 95,-207.82565 95,-207.82565 l -4.56806,-4.28256 c 0,0 -0.32629,-0.30589 -0.65258,0 z"
+           stroke-miterlimit="4"
+           sodipodi:nodetypes="cccccccc" />
+        <path
+           clip-path="none"
+           style="opacity:0.45;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.67076564;stroke-miterlimit:4;filter:url(#filter1735)"
+           inkscape:connector-curvature="0"
+           id="path1697"
+           d="m 89.77936,-196.72739 -4.56806,-4.28256 c 0,0 0,-1.22359 1.30937,-1.21929 l 3.58498,3.66646 3.58919,-3.67076 c 1.30516,0 1.30516,1.22359 1.30516,1.22359 l -4.56806,4.28256 c 0,0 -0.32629,0.30589 -0.65258,0 z"
+           stroke-miterlimit="4"
+           sodipodi:nodetypes="cccccccc" />
+        <path
+           sodipodi:nodetypes="cccccccc"
+           stroke-miterlimit="4"
+           d="m 89.77936,-197.17872 -4.56806,-4.28256 c 0,0 0,-1.22359 1.30937,-1.21929 l 3.58498,3.66646 3.58919,-3.67076 c 1.30516,0 1.30516,1.22359 1.30516,1.22359 l -4.56806,4.28256 c 0,0 -0.32629,0.30589 -0.65258,0 z"
+           id="path1621"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.67076564;stroke-miterlimit:4"
+           clip-path="none" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/src/gtk-3.0/assets/combobox-arrow.png b/src/gtk-3.0/assets/combobox-arrow.png
index 2d07509..304b8cd 100644
Binary files a/src/gtk-3.0/assets/combobox-arrow.png and b/src/gtk-3.0/assets/combobox-arrow.png differ
diff --git a/src/gtk-3.0/assets/combobox-arrow@2.png b/src/gtk-3.0/assets/combobox-arrow@2.png
index 0555b98..d4bd636 100644
Binary files a/src/gtk-3.0/assets/combobox-arrow@2.png and b/src/gtk-3.0/assets/combobox-arrow@2.png differ
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index d21e856..0f0310a 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -841,14 +841,13 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
-  padding-left: 8px;
-  padding-right: 8px; }
+  margin: 0;
+  padding: 0 12px; }
 combobox arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
-  min-height: 16px;
-  min-width: 16px;
+  min-width: 20px;
   padding: 0;
-  margin: -1px -9px -1px -1px;
+  margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
   color: #ffffff;
   border: 1px solid #686868;
@@ -1261,68 +1260,10 @@ headerbar .linked:not(.vertical).path-bar > button,
     opacity: 0.7;
     box-shadow: none;
     background-image: none; }
-headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button,
-headerbar .linked:not(.vertical).path-bar > button + button,
-.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry {
-  border-left-color: rgba(24, 24, 24, 0); }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error {
-  border-left-color: rgba(24, 24, 24, 0); }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning {
-  border-left-color: rgba(24, 24, 24, 0); }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error {
-  border-left-color: rgba(24, 24, 24, 0); }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child),
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child {
-  border-left-color: #66a1ff; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
-headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
-  border-left-color: #66a1ff; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child),
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
-  border-left-color: #F08437; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
-headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
-  border-left-color: #F08437; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child),
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
-  border-left-color: #F27835; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > box > button.combo,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > box > button.combo {
-  border-left-color: #F27835; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child),
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child {
-  border-left-color: #FC4138; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo {
-  border-left-color: #FC4138; }
 headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry,
 headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry,
 .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry {
-  border-left-color: #66a1ff; }
+  border-left-color: rgba(255, 255, 255, 0.12); }
 headerbar button.suggested-action, .nemo-window .primary-toolbar button.suggested-action {
   background-clip: border-box;
   color: white;
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 21aa458..7ce2e65 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -844,14 +844,13 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
-  padding-left: 8px;
-  padding-right: 8px; }
+  margin: 0;
+  padding: 0 12px; }
 combobox arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
-  min-height: 16px;
-  min-width: 16px;
+  min-width: 20px;
   padding: 0;
-  margin: -1px -9px -1px -1px;
+  margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
   color: #ffffff;
   border: 1px solid #0e6bff;
@@ -1261,68 +1260,10 @@ headerbar .linked:not(.vertical).path-bar > button,
     opacity: 0.7;
     box-shadow: none;
     background-image: none; }
-headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button,
-headerbar .linked:not(.vertical).path-bar > button + button,
-.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry {
-  border-left-color: rgba(40, 32, 32, 0); }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error {
-  border-left-color: #FC4138; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning {
-  border-left-color: #F27835; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error {
-  border-left-color: #f75d37; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child),
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child {
-  border-left-color: #74aaff; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
-headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
-  border-left-color: #74aaff; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child),
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
-  border-left-color: #F08437; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
-headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
-  border-left-color: #F08437; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child),
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
-  border-left-color: #F27835; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > box > button.combo,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > box > button.combo {
-  border-left-color: #F27835; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child),
-headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child {
-  border-left-color: #FC4138; }
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
-headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo,
-.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo {
-  border-left-color: #FC4138; }
 headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry,
 headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry,
 .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry {
-  border-left-color: #74aaff; }
+  border-left-color: rgba(0, 0, 0, 0.11); }
 headerbar button.suggested-action, .nemo-window .primary-toolbar button.suggested-action {
   background-clip: border-box;
   color: white;
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 239d07f..95260f1 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -926,17 +926,17 @@ spinbutton {
 combobox {
   button.combo {
     min-width: 0;       // otherwise the arrow placement is unsymmetric
-    padding-left: 8px;
-    padding-right: 8px;
+    margin: 0;
+    padding: 0 12px;
   }
   arrow {
     -gtk-icon-source: -gtk-scaled(
                        url("assets/combobox-arrow.png"),
                        url("assets/combobox-arrow@2.png"));
-    min-height: 16px;
-    min-width: 16px;
+//    min-height: 0;
+    min-width: 20px;
     padding: 0;
-    margin: -1px -9px -1px -1px;
+    margin: -1px -13px -1px -1px;
     border-radius: 0 $bt_radius $bt_radius 0;
     color: $selected_fg_color;
     border: 1px solid if($variant=='light', $selected_bg_color, #686868);
@@ -1411,16 +1411,18 @@ headerbar {
       &, &:hover, &:active, &:checked, &:disabled { @extend %linked; }
     }
 
-    @include pathbar_linking_rules($sep_color: $button_border);
+//    @include pathbar_linking_rules($sep_color: $button_border);
   }
 
   // use linking rules for entries only
   .linked:not(.vertical):not(.path-bar) {
-    @include linking_rules( $a:0.5,
-                            $var:if($variant=='light' and $darker=='false', 'light', 'dark'),
-                            $button_rules:'false',
-                            $e_border:$header_entry_border,
-                            $b_border:$header_button_border );
+//    @include linking_rules( $a:0.5,
+//                            $var:if($variant=='light' and $darker=='false', 'light', 'dark'),
+//                            $button_rules:'false',
+//                            $e_border:$header_entry_border,
+//                            $b_border:$header_button_border );
+    > button:active + entry,
+    > button:checked + entry { border-left-color: $borders_color; }
   }
 
   // Headerbar Suggested and Destructive Action buttons