From 717de74fa8ac3a1e7ab06b0c1a23a370e482acbf Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Wed, 7 Mar 2018 23:36:35 +0800
Subject: [PATCH] Fixed bugs

---
 src/gnome-shell/assets/toggle-off-dark.svg  |  93 +++++++++++-
 src/gnome-shell/assets/toggle-off-light.svg |  93 +++++++++++-
 src/gnome-shell/assets/toggle-on.svg        | 150 ++++++++++++++++----
 src/gnome-shell/gnome-shell-dark-solid.css  |   2 +-
 src/gnome-shell/gnome-shell-dark.css        |   2 +-
 src/gnome-shell/gnome-shell-light-solid.css |   2 +-
 src/gnome-shell/gnome-shell-light.css       |   2 +-
 src/gnome-shell/sass/_common.scss           |   2 +-
 src/gtk-3.0/gtk-dark-solid.css              | 105 +++++++-------
 src/gtk-3.0/gtk-dark.css                    | 105 +++++++-------
 src/gtk-3.0/gtk-light-solid.css             | 105 +++++++-------
 src/gtk-3.0/gtk-light.css                   | 105 +++++++-------
 src/gtk-3.0/sass/_applications.scss         |  14 +-
 src/gtk-3.0/sass/_common.scss               |  64 +++++----
 src/gtk-3.0/sass/_drawing.scss              |   8 +-
 15 files changed, 568 insertions(+), 284 deletions(-)

diff --git a/src/gnome-shell/assets/toggle-off-dark.svg b/src/gnome-shell/assets/toggle-off-dark.svg
index ec831ce..f241261 100644
--- a/src/gnome-shell/assets/toggle-off-dark.svg
+++ b/src/gnome-shell/assets/toggle-off-dark.svg
@@ -1,4 +1,91 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="20" viewBox="0 0 40 20">
-  <rect x="2" y="2" width="36" height="16" ry="8" fill="#FFFFFF" opacity="0.3"/>
-  <circle cx="10" cy="10" r="6" fill="#FFFFFF"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50"
+   height="20"
+   viewBox="0 0 50 20"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="toggle-off-dark.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.65625"
+     inkscape:cx="15.536778"
+     inkscape:cy="18.267821"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     width="40px"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
+    <g
+       id="g4562"
+       transform="translate(-5.1851991,-0.59123127)">
+      <g
+         transform="matrix(1.0109881,0,0,0.96970664,-0.43462179,32.056001)"
+         id="g4556">
+        <path
+           style="fill:#535353;fill-opacity:1;stroke:#555555;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 15.787004,1034.4777 h 29 c 4.432,0 8,3.568 8,8 0,4.432 -3.568,8 -8,8 h -29 c -4.432,0 -8.0000005,-3.568 -8.0000005,-8 0,-4.432 3.5680005,-8 8.0000005,-8 z"
+           id="rect4140" />
+        <circle
+           style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:1.37497962;opacity:0.35"
+           id="circle4587"
+           cx="15.744821"
+           cy="1042.4775"
+           r="8.2498779" />
+        <circle
+           r="7.2186861"
+           cy="1042.4775"
+           cx="15.744821"
+           id="circle4531"
+           style="fill:#d8d8d8;fill-opacity:1;stroke:none;stroke-width:1.20311427" />
+      </g>
+    </g>
+  </g>
 </svg>
diff --git a/src/gnome-shell/assets/toggle-off-light.svg b/src/gnome-shell/assets/toggle-off-light.svg
index fc7efcb..0bbed01 100644
--- a/src/gnome-shell/assets/toggle-off-light.svg
+++ b/src/gnome-shell/assets/toggle-off-light.svg
@@ -1,4 +1,91 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="20" viewBox="0 0 40 20">
-  <rect x="2" y="2" width="36" height="16" ry="8" fill="#000000" opacity="0.26"/>
-  <circle cx="10" cy="10" r="6" fill="#FFFFFF"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50"
+   height="20"
+   viewBox="0 0 50 20"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="toggle-off-light.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.241786"
+     inkscape:cx="25.120359"
+     inkscape:cy="11.674443"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     width="40px"
+     inkscape:window-width="732"
+     inkscape:window-height="485"
+     inkscape:window-x="462"
+     inkscape:window-y="182"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
+    <g
+       id="g4562"
+       transform="translate(-5.1851991,-0.59123127)">
+      <g
+         transform="matrix(1.0109881,0,0,0.96970664,-0.43462179,32.056001)"
+         id="g4556">
+        <path
+           style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 15.787004,1034.4777 h 29 c 4.432,0 8,3.568 8,8 0,4.432 -3.568,8 -8,8 h -29 c -4.432,0 -8.0000005,-3.568 -8.0000005,-8 0,-4.432 3.5680005,-8 8.0000005,-8 z"
+           id="rect4140" />
+        <circle
+           style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1.37497962;opacity:0.35"
+           id="circle4587"
+           cx="15.744821"
+           cy="1042.4775"
+           r="8.2498779" />
+        <circle
+           r="7.2186861"
+           cy="1042.4775"
+           cx="15.744821"
+           id="circle4531"
+           style="fill:#d8d8d8;fill-opacity:1;stroke:none;stroke-width:1.20311427" />
+      </g>
+    </g>
+  </g>
 </svg>
diff --git a/src/gnome-shell/assets/toggle-on.svg b/src/gnome-shell/assets/toggle-on.svg
index c5c54c0..b3d8984 100644
--- a/src/gnome-shell/assets/toggle-on.svg
+++ b/src/gnome-shell/assets/toggle-on.svg
@@ -7,17 +7,89 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
+   width="50"
    height="20"
-   viewBox="0 0 40 20"
+   viewBox="0 0 50 20"
    id="svg2"
    version="1.1"
    inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
    sodipodi:docname="toggle-on.svg">
   <defs
-     id="defs4" />
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4527">
+      <stop
+         style="stop-color:#00429b;stop-opacity:1"
+         offset="0"
+         id="stop4523" />
+      <stop
+         style="stop-color:#499aff;stop-opacity:1"
+         offset="1"
+         id="stop4525" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4519">
+      <stop
+         style="stop-color:#005cd4;stop-opacity:1"
+         offset="0"
+         id="stop4515" />
+      <stop
+         style="stop-color:#6fb3ff;stop-opacity:1"
+         offset="1"
+         id="stop4517" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4519"
+       id="linearGradient4521"
+       x1="15"
+       y1="1050.3622"
+       x2="15"
+       y2="1034.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(14.787004,0.11552347)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4527"
+       id="linearGradient4529"
+       x1="19"
+       y1="1050.3622"
+       x2="19"
+       y2="1034.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(14.787004,0.11552347)" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4549"
+       x="-0.035893459"
+       width="1.0717869"
+       y="-0.036107175"
+       height="1.0722142">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.21888099"
+         id="feGaussianBlur4551" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4580"
+       x="-0.19800031"
+       width="1.3960006"
+       y="-0.019799997"
+       height="1.0396">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.082500129"
+         id="feGaussianBlur4582" />
+    </filter>
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,21 +97,23 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.1208931"
-     inkscape:cx="-13.86471"
-     inkscape:cy="12.063553"
+     inkscape:zoom="17.3125"
+     inkscape:cx="17.032958"
+     inkscape:cy="16.231187"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      units="px"
      width="40px"
      inkscape:window-width="1366"
-     inkscape:window-height="691"
+     inkscape:window-height="740"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="28"
      inkscape:window-maximized="1"
      inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
+     inkscape:bbox-nodes="true"
+     inkscape:snap-global="false"
+     inkscape:snap-nodes="true">
     <inkscape:grid
        type="xygrid"
        id="grid4136" />
@@ -52,7 +126,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -61,20 +135,48 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1032.3622)">
+    <g
+       id="g4562"
+       transform="translate(-5.1851991,-0.59123127)">
+      <g
+         transform="matrix(1.0109881,0,0,0.96970664,-0.43462179,32.056001)"
+         id="g4556">
+        <path
+           style="fill:url(#linearGradient4521);fill-opacity:1;stroke:url(#linearGradient4529);stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 15.787004,1034.4777 h 29 c 4.432,0 8,3.568 8,8 0,4.432 -3.568,8 -8,8 h -29 c -4.432,0 -8.0000005,-3.568 -8.0000005,-8 0,-4.432 3.5680005,-8 8.0000005,-8 z"
+           id="rect4140" />
+        <ellipse
+           style="fill:#00429b;fill-opacity:1;stroke:none;stroke-width:1.21599948;filter:url(#filter4549)"
+           id="path4142"
+           cx="30.144405"
+           cy="1042.701"
+           rx="7.3176894"
+           ry="7.2743769"
+           transform="matrix(1.0073647,0,0,1.0073647,14.206039,-7.5823938)" />
+        <circle
+           r="7"
+           cy="1042.4777"
+           cx="44.787003"
+           id="circle4531"
+           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.16666663" />
+      </g>
+    </g>
     <rect
-       style="stroke:none;fill:#71c837;fill-opacity:1"
-       id="rect4140"
-       width="36"
-       height="16"
-       x="2"
-       y="1034.3622"
-       rx="8"
-       ry="8" />
-    <circle
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="path4142"
-       cx="30"
-       cy="1042.3622"
-       r="6" />
+       ry="1.7382812e-05"
+       y="1037.6979"
+       x="13.33574"
+       height="10.000017"
+       width="1"
+       id="rect4566"
+       style="opacity:1;fill:#00429b;fill-opacity:1;stroke:none;stroke-width:0.35355338;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;filter:url(#filter4580)"
+       transform="matrix(1.326194,0,0,1.0142465,-4.6438927,-14.875224)" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.35355338;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect4564"
+       width="1"
+       height="10.000017"
+       x="13"
+       y="1037.3622"
+       ry="1.7382812e-05" />
   </g>
 </svg>
diff --git a/src/gnome-shell/gnome-shell-dark-solid.css b/src/gnome-shell/gnome-shell-dark-solid.css
index ab3dbb0..31886c6 100644
--- a/src/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/gnome-shell/gnome-shell-dark-solid.css
@@ -291,7 +291,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Switches */
 .toggle-switch {
-  width: 40px;
+  width: 50px;
   height: 20px;
   background-size: contain;
 }
diff --git a/src/gnome-shell/gnome-shell-dark.css b/src/gnome-shell/gnome-shell-dark.css
index 1886409..a7713bd 100644
--- a/src/gnome-shell/gnome-shell-dark.css
+++ b/src/gnome-shell/gnome-shell-dark.css
@@ -291,7 +291,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Switches */
 .toggle-switch {
-  width: 40px;
+  width: 50px;
   height: 20px;
   background-size: contain;
 }
diff --git a/src/gnome-shell/gnome-shell-light-solid.css b/src/gnome-shell/gnome-shell-light-solid.css
index 6c4cc8d..3a73b55 100644
--- a/src/gnome-shell/gnome-shell-light-solid.css
+++ b/src/gnome-shell/gnome-shell-light-solid.css
@@ -291,7 +291,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Switches */
 .toggle-switch {
-  width: 40px;
+  width: 50px;
   height: 20px;
   background-size: contain;
 }
diff --git a/src/gnome-shell/gnome-shell-light.css b/src/gnome-shell/gnome-shell-light.css
index 3030a1a..93c247e 100644
--- a/src/gnome-shell/gnome-shell-light.css
+++ b/src/gnome-shell/gnome-shell-light.css
@@ -291,7 +291,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Switches */
 .toggle-switch {
-  width: 40px;
+  width: 50px;
   height: 20px;
   background-size: contain;
 }
diff --git a/src/gnome-shell/sass/_common.scss b/src/gnome-shell/sass/_common.scss
index c7cecbe..a3886df 100644
--- a/src/gnome-shell/sass/_common.scss
+++ b/src/gnome-shell/sass/_common.scss
@@ -199,7 +199,7 @@ $slider_color: if($variant == 'light', $accent_color, white);
 
 /* Switches */
 .toggle-switch {
-  width: 40px;
+  width: 50px;
   height: 20px;
   background-size: contain;
 }
diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
index 84a7823..3772874 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -414,11 +414,10 @@ treeview entry.flat:focus, treeview .raven .raven-background spinbutton:focus:no
   }
 }
 
-list,
-button:not(.flat):not(.osd) {
+button {
   outline-color: #8eb9ff;
   outline-style: solid;
-  outline-offset: -1px;
+  outline-offset: 0;
   outline-width: 3px;
   -gtk-outline-radius: 6px;
 }
@@ -439,6 +438,15 @@ button separator {
   margin: 4px 1px;
 }
 
+.linked:not(.vertical) > button,
+.linked.vertical > button, combobox, popover button,
+popover.background button, button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgie-panel button.flat.launcher, button.osd, button.sidebar-button, button.circular-button {
+  outline-color: alpha(currentColor,0.3);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+}
+
 button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgie-panel button.flat.launcher {
   border: none;
   background-color: transparent;
@@ -447,9 +455,9 @@ button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgi
 }
 
 button.flat:hover, button.budgie-menu-launcher:hover, .budgie-panel #tasklist-button:hover, .budgie-panel button.flat.launcher:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -459,7 +467,6 @@ button.flat:hover:active, button.budgie-menu-launcher:hover:active, .budgie-pane
 }
 
 button.flat:active, button.budgie-menu-launcher:active, .budgie-panel #tasklist-button:active, .budgie-panel button.flat.launcher:active, button.flat:checked, button.budgie-menu-launcher:checked, .budgie-panel #tasklist-button:checked, .budgie-panel button.flat.launcher:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -806,16 +813,6 @@ button.font separator, button.file separator {
   border-radius: 5px;
 }
 
-button.image-button,
-.linked.vertical > button,
-.linked:not(.vertical) > button {
-  outline-color: alpha(currentColor,0.3);
-  outline-style: dashed;
-  outline-offset: -3px;
-  outline-width: 1px;
-  -gtk-outline-radius: 5px;
-}
-
 .inline-toolbar toolbutton > button {
   min-height: 20px;
   border: none;
@@ -824,13 +821,12 @@ button.image-button,
 }
 
 .inline-toolbar toolbutton > button:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -840,7 +836,6 @@ button.image-button,
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -849,7 +844,7 @@ button.image-button,
 
 .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
   background-color: white;
-  border: none;
+  border-color: white;
   opacity: 0.6;
 }
 
@@ -4009,18 +4004,16 @@ row.activatable:selected.has-open-popup, .budgie-menu button:selected.has-open-p
   min-height: 24px;
   min-width: 24px;
   border-radius: 100px;
-  outline-offset: -1px;
   -gtk-outline-radius: 100px;
 }
 
 .app-notification button:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
 }
 
 .app-notification button:active, .app-notification button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -4030,7 +4023,6 @@ row.activatable:selected.has-open-popup, .budgie-menu button:selected.has-open-p
 
 .app-notification button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4115,14 +4107,13 @@ messagedialog.csd .dialog-action-area button {
 }
 
 messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
 messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -4230,17 +4221,26 @@ placessidebar row label.sidebar-label:dir(rtl) {
   padding-left: 2px;
 }
 
-placessidebar row button.sidebar-button {
+button.sidebar-button {
   min-width: 22px;
   min-height: 22px;
   margin-top: 2px;
   margin-bottom: 2px;
   padding: 0;
-  border-radius: 100%;
-  -gtk-outline-radius: 100%;
+  border-radius: 100px;
+  -gtk-outline-radius: 100px;
 }
 
-placessidebar row button.sidebar-button:not(:hover):not(:active) > image {
+button.sidebar-button:active, button.sidebar-button:checked {
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0.35);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  border-color: rgba(255, 255, 255, 0.35);
+}
+
+button.sidebar-button:not(:hover):not(:active) > image {
   opacity: 0.5;
 }
 
@@ -4567,7 +4567,7 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
   font-family: Monospace;
 }
 
-button.circular, button.nautilus-circular-button.image-button,
+button.circular, headerbar button.circular-button, .nemo-window .primary-toolbar button.circular-button, row button.circular-button, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
   margin: 0 2px;
@@ -4578,27 +4578,27 @@ button.circular-button {
   border: none;
 }
 
-button.circular:active, button.nautilus-circular-button.image-button:active,
+button.circular:active, headerbar button.circular-button:active, .nemo-window .primary-toolbar button.circular-button:active, row button.circular-button:active, button.nautilus-circular-button.image-button:active,
 button.circular-button:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
   text-shadow: none;
   -gtk-icon-shadow: none;
+  border: none;
 }
 
-button.circular:checked, button.nautilus-circular-button.image-button:checked,
+button.circular:checked, headerbar button.circular-button:checked, .nemo-window .primary-toolbar button.circular-button:checked, row button.circular-button:checked, button.nautilus-circular-button.image-button:checked,
 button.circular-button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.35);
   text-shadow: none;
   -gtk-icon-shadow: none;
+  border: none;
 }
 
-button.circular label, button.nautilus-circular-button.image-button label,
+button.circular label, headerbar button.circular-button label, .nemo-window .primary-toolbar button.circular-button label, row button.circular-button label, button.nautilus-circular-button.image-button label,
 button.circular-button label {
   padding: 0;
 }
@@ -4618,8 +4618,20 @@ stackswitcher button.text-button {
   min-width: 80px;
 }
 
-stackswitcher button.circular, stackswitcher button.nautilus-circular-button.image-button {
-  min-width: 0;
+stackswitcher button.circular, stackswitcher headerbar button.circular-button, headerbar stackswitcher button.circular-button, stackswitcher .nemo-window .primary-toolbar button.circular-button, .nemo-window .primary-toolbar stackswitcher button.circular-button, stackswitcher row button.circular-button, row stackswitcher button.circular-button, stackswitcher button.nautilus-circular-button.image-button,
+stackswitcher button.text-button.circular,
+stackswitcher headerbar button.text-button.circular-button, headerbar
+stackswitcher button.text-button.circular-button,
+stackswitcher .nemo-window .primary-toolbar button.text-button.circular-button, .nemo-window .primary-toolbar
+stackswitcher button.text-button.circular-button,
+stackswitcher row button.text-button.circular-button, row
+stackswitcher button.text-button.circular-button,
+stackswitcher button.text-button.nautilus-circular-button.image-button {
+  min-width: 28px;
+  min-height: 28px;
+  border-radius: 100px;
+  -gtk-outline-radius: 100px;
+  padding: 0;
 }
 
 *:drop(active):focus,
@@ -5674,7 +5686,6 @@ gf-candidate-box:hover, gf-candidate-box:selected {
 }
 
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5714,7 +5725,6 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:activ
 window.solid-csd > box.vertical > box.vertical > .horizontal.inline-toolbar button:active,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked,
 window.solid-csd > box.vertical > box.vertical > .horizontal.inline-toolbar button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5741,7 +5751,6 @@ window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > bu
 }
 
 window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:active, window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem .linked > button.image-button.raised:active, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked, window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem .linked > button.image-button.raised:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5775,7 +5784,6 @@ window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked >
 window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):active,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked,
 window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5808,7 +5816,6 @@ window.background > grid.vertical > box.vertical grid.math-buttons button {
 window.background > grid.vertical > box.vertical > widget button:not(.suggested-action):active,
 window.background > grid.vertical > box.vertical > box.vertical > widget button:not(.suggested-action):active,
 window.background > grid.vertical > box.vertical grid.math-buttons button:not(.suggested-action):active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5819,7 +5826,6 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
 window.background > grid.vertical > box.vertical > widget button:not(.suggested-action):checked,
 window.background > grid.vertical > box.vertical > box.vertical > widget button:not(.suggested-action):checked,
 window.background > grid.vertical > box.vertical grid.math-buttons button:not(.suggested-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.35);
@@ -5886,7 +5892,6 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar
 }
 
 popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-action):not(.suggested-action):only-child:active, popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-action):not(.suggested-action):only-child:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5914,7 +5919,6 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > row.activatable:active, .budgie-menu popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > button:active, popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > row.activatable:checked, .budgie-menu popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -6396,13 +6400,12 @@ window.background.chromium headerbar.titlebar button.toggle {
 }
 
 window.background.chromium headerbar.titlebar button.toggle:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -7404,13 +7407,12 @@ filechooser placessidebar.sidebar scrollbar trough,
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:hover, .budgie-popover:not(.budgie-menu) button.flat:hover:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:hover:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:hover:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:hover:not(.image-button), .workspace-switcher .workspace-add-button:hover, .raven .raven-header:not(.top) button:hover, .raven-mpris button.image-button:hover, .drop-shadow button:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:checked:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:checked:not(.image-button), .workspace-switcher .workspace-add-button:checked, .raven .raven-header:not(.top) button:checked, .raven-mpris button.image-button:checked, .drop-shadow button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.35);
@@ -7419,7 +7421,6 @@ filechooser placessidebar.sidebar scrollbar trough,
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:active:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven .raven-header:not(.top) button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -7429,7 +7430,6 @@ filechooser placessidebar.sidebar scrollbar trough,
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven .raven-header:not(.top) button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button) label, .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button) label, .workspace-switcher .workspace-add-button:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven-mpris button.image-button:disabled label, .drop-shadow button:disabled label, .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven .raven-header:not(.top) button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8106,15 +8106,14 @@ window.budgie-switcher-window flowboxchild {
 }
 
 .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
   border-color: rgba(255, 255, 255, 0.12);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
 .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):active, .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index c21eca4..c558b8d 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -414,11 +414,10 @@ treeview entry.flat:focus, treeview .raven .raven-background spinbutton:focus:no
   }
 }
 
-list,
-button:not(.flat):not(.osd) {
+button {
   outline-color: #8eb9ff;
   outline-style: solid;
-  outline-offset: -1px;
+  outline-offset: 0;
   outline-width: 3px;
   -gtk-outline-radius: 6px;
 }
@@ -439,6 +438,15 @@ button separator {
   margin: 4px 1px;
 }
 
+.linked:not(.vertical) > button,
+.linked.vertical > button, combobox, popover button,
+popover.background button, button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgie-panel button.flat.launcher, button.osd, button.sidebar-button, button.circular-button {
+  outline-color: alpha(currentColor,0.3);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+}
+
 button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgie-panel button.flat.launcher {
   border: none;
   background-color: transparent;
@@ -447,9 +455,9 @@ button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgi
 }
 
 button.flat:hover, button.budgie-menu-launcher:hover, .budgie-panel #tasklist-button:hover, .budgie-panel button.flat.launcher:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -459,7 +467,6 @@ button.flat:hover:active, button.budgie-menu-launcher:hover:active, .budgie-pane
 }
 
 button.flat:active, button.budgie-menu-launcher:active, .budgie-panel #tasklist-button:active, .budgie-panel button.flat.launcher:active, button.flat:checked, button.budgie-menu-launcher:checked, .budgie-panel #tasklist-button:checked, .budgie-panel button.flat.launcher:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -806,16 +813,6 @@ button.font separator, button.file separator {
   border-radius: 5px;
 }
 
-button.image-button,
-.linked.vertical > button,
-.linked:not(.vertical) > button {
-  outline-color: alpha(currentColor,0.3);
-  outline-style: dashed;
-  outline-offset: -3px;
-  outline-width: 1px;
-  -gtk-outline-radius: 5px;
-}
-
 .inline-toolbar toolbutton > button {
   min-height: 20px;
   border: none;
@@ -824,13 +821,12 @@ button.image-button,
 }
 
 .inline-toolbar toolbutton > button:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -840,7 +836,6 @@ button.image-button,
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -849,7 +844,7 @@ button.image-button,
 
 .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
   background-color: white;
-  border: none;
+  border-color: white;
   opacity: 0.6;
 }
 
@@ -4009,18 +4004,16 @@ row.activatable:selected.has-open-popup, .budgie-menu button:selected.has-open-p
   min-height: 24px;
   min-width: 24px;
   border-radius: 100px;
-  outline-offset: -1px;
   -gtk-outline-radius: 100px;
 }
 
 .app-notification button:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
 }
 
 .app-notification button:active, .app-notification button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -4030,7 +4023,6 @@ row.activatable:selected.has-open-popup, .budgie-menu button:selected.has-open-p
 
 .app-notification button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4115,14 +4107,13 @@ messagedialog.csd .dialog-action-area button {
 }
 
 messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
 messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -4230,17 +4221,26 @@ placessidebar row label.sidebar-label:dir(rtl) {
   padding-left: 2px;
 }
 
-placessidebar row button.sidebar-button {
+button.sidebar-button {
   min-width: 22px;
   min-height: 22px;
   margin-top: 2px;
   margin-bottom: 2px;
   padding: 0;
-  border-radius: 100%;
-  -gtk-outline-radius: 100%;
+  border-radius: 100px;
+  -gtk-outline-radius: 100px;
 }
 
-placessidebar row button.sidebar-button:not(:hover):not(:active) > image {
+button.sidebar-button:active, button.sidebar-button:checked {
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0.35);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  border-color: rgba(255, 255, 255, 0.35);
+}
+
+button.sidebar-button:not(:hover):not(:active) > image {
   opacity: 0.5;
 }
 
@@ -4567,7 +4567,7 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
   font-family: Monospace;
 }
 
-button.circular, button.nautilus-circular-button.image-button,
+button.circular, headerbar button.circular-button, .nemo-window .primary-toolbar button.circular-button, row button.circular-button, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
   margin: 0 2px;
@@ -4578,27 +4578,27 @@ button.circular-button {
   border: none;
 }
 
-button.circular:active, button.nautilus-circular-button.image-button:active,
+button.circular:active, headerbar button.circular-button:active, .nemo-window .primary-toolbar button.circular-button:active, row button.circular-button:active, button.nautilus-circular-button.image-button:active,
 button.circular-button:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
   text-shadow: none;
   -gtk-icon-shadow: none;
+  border: none;
 }
 
-button.circular:checked, button.nautilus-circular-button.image-button:checked,
+button.circular:checked, headerbar button.circular-button:checked, .nemo-window .primary-toolbar button.circular-button:checked, row button.circular-button:checked, button.nautilus-circular-button.image-button:checked,
 button.circular-button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.35);
   text-shadow: none;
   -gtk-icon-shadow: none;
+  border: none;
 }
 
-button.circular label, button.nautilus-circular-button.image-button label,
+button.circular label, headerbar button.circular-button label, .nemo-window .primary-toolbar button.circular-button label, row button.circular-button label, button.nautilus-circular-button.image-button label,
 button.circular-button label {
   padding: 0;
 }
@@ -4618,8 +4618,20 @@ stackswitcher button.text-button {
   min-width: 80px;
 }
 
-stackswitcher button.circular, stackswitcher button.nautilus-circular-button.image-button {
-  min-width: 0;
+stackswitcher button.circular, stackswitcher headerbar button.circular-button, headerbar stackswitcher button.circular-button, stackswitcher .nemo-window .primary-toolbar button.circular-button, .nemo-window .primary-toolbar stackswitcher button.circular-button, stackswitcher row button.circular-button, row stackswitcher button.circular-button, stackswitcher button.nautilus-circular-button.image-button,
+stackswitcher button.text-button.circular,
+stackswitcher headerbar button.text-button.circular-button, headerbar
+stackswitcher button.text-button.circular-button,
+stackswitcher .nemo-window .primary-toolbar button.text-button.circular-button, .nemo-window .primary-toolbar
+stackswitcher button.text-button.circular-button,
+stackswitcher row button.text-button.circular-button, row
+stackswitcher button.text-button.circular-button,
+stackswitcher button.text-button.nautilus-circular-button.image-button {
+  min-width: 28px;
+  min-height: 28px;
+  border-radius: 100px;
+  -gtk-outline-radius: 100px;
+  padding: 0;
 }
 
 *:drop(active):focus,
@@ -5674,7 +5686,6 @@ gf-candidate-box:hover, gf-candidate-box:selected {
 }
 
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5714,7 +5725,6 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:activ
 window.solid-csd > box.vertical > box.vertical > .horizontal.inline-toolbar button:active,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked,
 window.solid-csd > box.vertical > box.vertical > .horizontal.inline-toolbar button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5741,7 +5751,6 @@ window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > bu
 }
 
 window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:active, window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem .linked > button.image-button.raised:active, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked, window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem .linked > button.image-button.raised:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5775,7 +5784,6 @@ window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked >
 window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):active,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked,
 window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5808,7 +5816,6 @@ window.background > grid.vertical > box.vertical grid.math-buttons button {
 window.background > grid.vertical > box.vertical > widget button:not(.suggested-action):active,
 window.background > grid.vertical > box.vertical > box.vertical > widget button:not(.suggested-action):active,
 window.background > grid.vertical > box.vertical grid.math-buttons button:not(.suggested-action):active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5819,7 +5826,6 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
 window.background > grid.vertical > box.vertical > widget button:not(.suggested-action):checked,
 window.background > grid.vertical > box.vertical > box.vertical > widget button:not(.suggested-action):checked,
 window.background > grid.vertical > box.vertical grid.math-buttons button:not(.suggested-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.35);
@@ -5886,7 +5892,6 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar
 }
 
 popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-action):not(.suggested-action):only-child:active, popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-action):not(.suggested-action):only-child:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -5914,7 +5919,6 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > row.activatable:active, .budgie-menu popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > button:active, popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > row.activatable:checked, .budgie-menu popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -6396,13 +6400,12 @@ window.background.chromium headerbar.titlebar button.toggle {
 }
 
 window.background.chromium headerbar.titlebar button.toggle:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -7404,13 +7407,12 @@ filechooser placessidebar.sidebar scrollbar trough,
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:hover, .budgie-popover:not(.budgie-menu) button.flat:hover:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:hover:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:hover:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:hover:not(.image-button), .workspace-switcher .workspace-add-button:hover, .raven .raven-header:not(.top) button:hover, .raven-mpris button.image-button:hover, .drop-shadow button:hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:checked:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:checked:not(.image-button), .workspace-switcher .workspace-add-button:checked, .raven .raven-header:not(.top) button:checked, .raven-mpris button.image-button:checked, .drop-shadow button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.35);
@@ -7419,7 +7421,6 @@ filechooser placessidebar.sidebar scrollbar trough,
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:active:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven .raven-header:not(.top) button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
@@ -7429,7 +7430,6 @@ filechooser placessidebar.sidebar scrollbar trough,
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven .raven-header:not(.top) button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button) label, .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button) label, .workspace-switcher .workspace-add-button:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven-mpris button.image-button:disabled label, .drop-shadow button:disabled label, .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven .raven-header:not(.top) button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8106,15 +8106,14 @@ window.budgie-switcher-window flowboxchild {
 }
 
 .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):hover {
-  border: none;
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
+  border-color: rgba(255, 255, 255, 0.15);
   border-color: rgba(255, 255, 255, 0.12);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
 .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):active, .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(255, 255, 255, 0.25);
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
index ffd6e2e..a4a4e8c 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -415,11 +415,10 @@ treeview entry.flat:focus, treeview .raven .raven-background spinbutton:focus:no
   }
 }
 
-list,
-button:not(.flat):not(.osd) {
+button {
   outline-color: #8eb9ff;
   outline-style: solid;
-  outline-offset: -1px;
+  outline-offset: 0;
   outline-width: 3px;
   -gtk-outline-radius: 6px;
 }
@@ -441,6 +440,15 @@ button separator {
   margin: 4px 1px;
 }
 
+.linked:not(.vertical) > button,
+.linked.vertical > button, combobox, popover button,
+popover.background button, button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgie-panel button.flat.launcher, button.osd, button.sidebar-button, button.circular-button {
+  outline-color: alpha(currentColor,0.3);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+}
+
 button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgie-panel button.flat.launcher {
   border: none;
   background-color: transparent;
@@ -449,9 +457,9 @@ button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgi
 }
 
 button.flat:hover, button.budgie-menu-launcher:hover, .budgie-panel #tasklist-button:hover, .budgie-panel button.flat.launcher:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -461,7 +469,6 @@ button.flat:hover:active, button.budgie-menu-launcher:hover:active, .budgie-pane
 }
 
 button.flat:active, button.budgie-menu-launcher:active, .budgie-panel #tasklist-button:active, .budgie-panel button.flat.launcher:active, button.flat:checked, button.budgie-menu-launcher:checked, .budgie-panel #tasklist-button:checked, .budgie-panel button.flat.launcher:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -808,16 +815,6 @@ button.font separator, button.file separator {
   border-radius: 5px;
 }
 
-button.image-button,
-.linked.vertical > button,
-.linked:not(.vertical) > button {
-  outline-color: alpha(currentColor,0.3);
-  outline-style: dashed;
-  outline-offset: -3px;
-  outline-width: 1px;
-  -gtk-outline-radius: 5px;
-}
-
 .inline-toolbar toolbutton > button {
   min-height: 20px;
   border: none;
@@ -826,13 +823,12 @@ button.image-button,
 }
 
 .inline-toolbar toolbutton > button:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -842,7 +838,6 @@ button.image-button,
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -851,7 +846,7 @@ button.image-button,
 
 .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
   background-color: #575757;
-  border: none;
+  border-color: #575757;
   opacity: 0.6;
 }
 
@@ -4023,18 +4018,16 @@ row.activatable:selected.has-open-popup, .budgie-menu button:selected.has-open-p
   min-height: 24px;
   min-width: 24px;
   border-radius: 100px;
-  outline-offset: -1px;
   -gtk-outline-radius: 100px;
 }
 
 .app-notification button:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
 }
 
 .app-notification button:active, .app-notification button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -4044,7 +4037,6 @@ row.activatable:selected.has-open-popup, .budgie-menu button:selected.has-open-p
 
 .app-notification button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4129,14 +4121,13 @@ messagedialog.csd .dialog-action-area button {
 }
 
 messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
 messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -4244,17 +4235,26 @@ placessidebar row label.sidebar-label:dir(rtl) {
   padding-left: 2px;
 }
 
-placessidebar row button.sidebar-button {
+button.sidebar-button {
   min-width: 22px;
   min-height: 22px;
   margin-top: 2px;
   margin-bottom: 2px;
   padding: 0;
-  border-radius: 100%;
-  -gtk-outline-radius: 100%;
+  border-radius: 100px;
+  -gtk-outline-radius: 100px;
 }
 
-placessidebar row button.sidebar-button:not(:hover):not(:active) > image {
+button.sidebar-button:active, button.sidebar-button:checked {
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(0, 0, 0, 0.65);
+  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  border-color: rgba(0, 0, 0, 0.35);
+}
+
+button.sidebar-button:not(:hover):not(:active) > image {
   opacity: 0.5;
 }
 
@@ -4582,7 +4582,7 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
   font-family: Monospace;
 }
 
-button.circular, button.nautilus-circular-button.image-button,
+button.circular, headerbar button.circular-button, .nemo-window .primary-toolbar button.circular-button, row button.circular-button, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
   margin: 0 2px;
@@ -4594,27 +4594,27 @@ button.circular-button {
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01), 0 0 0 1px rgba(0, 0, 0, 0.11), inset 0 0 0 1px rgba(0, 0, 0, 0.01);
 }
 
-button.circular:active, button.nautilus-circular-button.image-button:active,
+button.circular:active, headerbar button.circular-button:active, .nemo-window .primary-toolbar button.circular-button:active, row button.circular-button:active, button.nautilus-circular-button.image-button:active,
 button.circular-button:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
   text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  border: none;
 }
 
-button.circular:checked, button.nautilus-circular-button.image-button:checked,
+button.circular:checked, headerbar button.circular-button:checked, .nemo-window .primary-toolbar button.circular-button:checked, row button.circular-button:checked, button.nautilus-circular-button.image-button:checked,
 button.circular-button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
   text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  border: none;
 }
 
-button.circular label, button.nautilus-circular-button.image-button label,
+button.circular label, headerbar button.circular-button label, .nemo-window .primary-toolbar button.circular-button label, row button.circular-button label, button.nautilus-circular-button.image-button label,
 button.circular-button label {
   padding: 0;
 }
@@ -4634,8 +4634,20 @@ stackswitcher button.text-button {
   min-width: 80px;
 }
 
-stackswitcher button.circular, stackswitcher button.nautilus-circular-button.image-button {
-  min-width: 0;
+stackswitcher button.circular, stackswitcher headerbar button.circular-button, headerbar stackswitcher button.circular-button, stackswitcher .nemo-window .primary-toolbar button.circular-button, .nemo-window .primary-toolbar stackswitcher button.circular-button, stackswitcher row button.circular-button, row stackswitcher button.circular-button, stackswitcher button.nautilus-circular-button.image-button,
+stackswitcher button.text-button.circular,
+stackswitcher headerbar button.text-button.circular-button, headerbar
+stackswitcher button.text-button.circular-button,
+stackswitcher .nemo-window .primary-toolbar button.text-button.circular-button, .nemo-window .primary-toolbar
+stackswitcher button.text-button.circular-button,
+stackswitcher row button.text-button.circular-button, row
+stackswitcher button.text-button.circular-button,
+stackswitcher button.text-button.nautilus-circular-button.image-button {
+  min-width: 28px;
+  min-height: 28px;
+  border-radius: 100px;
+  -gtk-outline-radius: 100px;
+  padding: 0;
 }
 
 *:drop(active):focus,
@@ -5691,7 +5703,6 @@ gf-candidate-box:hover, gf-candidate-box:selected {
 }
 
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5731,7 +5742,6 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:activ
 window.solid-csd > box.vertical > box.vertical > .horizontal.inline-toolbar button:active,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked,
 window.solid-csd > box.vertical > box.vertical > .horizontal.inline-toolbar button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5758,7 +5768,6 @@ window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > bu
 }
 
 window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:active, window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem .linked > button.image-button.raised:active, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked, window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem .linked > button.image-button.raised:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5792,7 +5801,6 @@ window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked >
 window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):active,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked,
 window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5825,7 +5833,6 @@ window.background > grid.vertical > box.vertical grid.math-buttons button {
 window.background > grid.vertical > box.vertical > widget button:not(.suggested-action):active,
 window.background > grid.vertical > box.vertical > box.vertical > widget button:not(.suggested-action):active,
 window.background > grid.vertical > box.vertical grid.math-buttons button:not(.suggested-action):active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5836,7 +5843,6 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
 window.background > grid.vertical > box.vertical > widget button:not(.suggested-action):checked,
 window.background > grid.vertical > box.vertical > box.vertical > widget button:not(.suggested-action):checked,
 window.background > grid.vertical > box.vertical grid.math-buttons button:not(.suggested-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
@@ -5899,7 +5905,6 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar
 }
 
 popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-action):not(.suggested-action):only-child:active, popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-action):not(.suggested-action):only-child:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5928,7 +5933,6 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > row.activatable:active, .budgie-menu popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > button:active, popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > row.activatable:checked, .budgie-menu popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -6408,13 +6412,12 @@ window.background.chromium headerbar.titlebar button.toggle {
 }
 
 window.background.chromium headerbar.titlebar button.toggle:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -7425,13 +7428,12 @@ filechooser placessidebar.sidebar scrollbar trough,
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:hover, .budgie-popover:not(.budgie-menu) button.flat:hover:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:hover:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:hover:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:hover:not(.image-button), .workspace-switcher .workspace-add-button:hover, .raven .raven-header:not(.top) button:hover, .raven-mpris button.image-button:hover, .drop-shadow button:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:checked:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:checked:not(.image-button), .workspace-switcher .workspace-add-button:checked, .raven .raven-header:not(.top) button:checked, .raven-mpris button.image-button:checked, .drop-shadow button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
@@ -7440,7 +7442,6 @@ filechooser placessidebar.sidebar scrollbar trough,
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:active:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven .raven-header:not(.top) button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -7450,7 +7451,6 @@ filechooser placessidebar.sidebar scrollbar trough,
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven .raven-header:not(.top) button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button) label, .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button) label, .workspace-switcher .workspace-add-button:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven-mpris button.image-button:disabled label, .drop-shadow button:disabled label, .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven .raven-header:not(.top) button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8127,15 +8127,14 @@ window.budgie-switcher-window flowboxchild {
 }
 
 .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
   border-color: rgba(0, 0, 0, 0.11);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
 .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):active, .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 8284097..b3d5a7a 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -415,11 +415,10 @@ treeview entry.flat:focus, treeview .raven .raven-background spinbutton:focus:no
   }
 }
 
-list,
-button:not(.flat):not(.osd) {
+button {
   outline-color: #8eb9ff;
   outline-style: solid;
-  outline-offset: -1px;
+  outline-offset: 0;
   outline-width: 3px;
   -gtk-outline-radius: 6px;
 }
@@ -441,6 +440,15 @@ button separator {
   margin: 4px 1px;
 }
 
+.linked:not(.vertical) > button,
+.linked.vertical > button, combobox, popover button,
+popover.background button, button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgie-panel button.flat.launcher, button.osd, button.sidebar-button, button.circular-button {
+  outline-color: alpha(currentColor,0.3);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+}
+
 button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgie-panel button.flat.launcher {
   border: none;
   background-color: transparent;
@@ -449,9 +457,9 @@ button.flat, button.budgie-menu-launcher, .budgie-panel #tasklist-button, .budgi
 }
 
 button.flat:hover, button.budgie-menu-launcher:hover, .budgie-panel #tasklist-button:hover, .budgie-panel button.flat.launcher:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -461,7 +469,6 @@ button.flat:hover:active, button.budgie-menu-launcher:hover:active, .budgie-pane
 }
 
 button.flat:active, button.budgie-menu-launcher:active, .budgie-panel #tasklist-button:active, .budgie-panel button.flat.launcher:active, button.flat:checked, button.budgie-menu-launcher:checked, .budgie-panel #tasklist-button:checked, .budgie-panel button.flat.launcher:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -808,16 +815,6 @@ button.font separator, button.file separator {
   border-radius: 5px;
 }
 
-button.image-button,
-.linked.vertical > button,
-.linked:not(.vertical) > button {
-  outline-color: alpha(currentColor,0.3);
-  outline-style: dashed;
-  outline-offset: -3px;
-  outline-width: 1px;
-  -gtk-outline-radius: 5px;
-}
-
 .inline-toolbar toolbutton > button {
   min-height: 20px;
   border: none;
@@ -826,13 +823,12 @@ button.image-button,
 }
 
 .inline-toolbar toolbutton > button:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -842,7 +838,6 @@ button.image-button,
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -851,7 +846,7 @@ button.image-button,
 
 .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
   background-color: #575757;
-  border: none;
+  border-color: #575757;
   opacity: 0.6;
 }
 
@@ -4023,18 +4018,16 @@ row.activatable:selected.has-open-popup, .budgie-menu button:selected.has-open-p
   min-height: 24px;
   min-width: 24px;
   border-radius: 100px;
-  outline-offset: -1px;
   -gtk-outline-radius: 100px;
 }
 
 .app-notification button:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
 }
 
 .app-notification button:active, .app-notification button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -4044,7 +4037,6 @@ row.activatable:selected.has-open-popup, .budgie-menu button:selected.has-open-p
 
 .app-notification button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4129,14 +4121,13 @@ messagedialog.csd .dialog-action-area button {
 }
 
 messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
 messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -4244,17 +4235,26 @@ placessidebar row label.sidebar-label:dir(rtl) {
   padding-left: 2px;
 }
 
-placessidebar row button.sidebar-button {
+button.sidebar-button {
   min-width: 22px;
   min-height: 22px;
   margin-top: 2px;
   margin-bottom: 2px;
   padding: 0;
-  border-radius: 100%;
-  -gtk-outline-radius: 100%;
+  border-radius: 100px;
+  -gtk-outline-radius: 100px;
 }
 
-placessidebar row button.sidebar-button:not(:hover):not(:active) > image {
+button.sidebar-button:active, button.sidebar-button:checked {
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(0, 0, 0, 0.65);
+  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  border-color: rgba(0, 0, 0, 0.35);
+}
+
+button.sidebar-button:not(:hover):not(:active) > image {
   opacity: 0.5;
 }
 
@@ -4582,7 +4582,7 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
   font-family: Monospace;
 }
 
-button.circular, button.nautilus-circular-button.image-button,
+button.circular, headerbar button.circular-button, .nemo-window .primary-toolbar button.circular-button, row button.circular-button, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
   margin: 0 2px;
@@ -4594,27 +4594,27 @@ button.circular-button {
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01), 0 0 0 1px rgba(0, 0, 0, 0.11), inset 0 0 0 1px rgba(0, 0, 0, 0.01);
 }
 
-button.circular:active, button.nautilus-circular-button.image-button:active,
+button.circular:active, headerbar button.circular-button:active, .nemo-window .primary-toolbar button.circular-button:active, row button.circular-button:active, button.nautilus-circular-button.image-button:active,
 button.circular-button:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
   text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  border: none;
 }
 
-button.circular:checked, button.nautilus-circular-button.image-button:checked,
+button.circular:checked, headerbar button.circular-button:checked, .nemo-window .primary-toolbar button.circular-button:checked, row button.circular-button:checked, button.nautilus-circular-button.image-button:checked,
 button.circular-button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
   text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  border: none;
 }
 
-button.circular label, button.nautilus-circular-button.image-button label,
+button.circular label, headerbar button.circular-button label, .nemo-window .primary-toolbar button.circular-button label, row button.circular-button label, button.nautilus-circular-button.image-button label,
 button.circular-button label {
   padding: 0;
 }
@@ -4634,8 +4634,20 @@ stackswitcher button.text-button {
   min-width: 80px;
 }
 
-stackswitcher button.circular, stackswitcher button.nautilus-circular-button.image-button {
-  min-width: 0;
+stackswitcher button.circular, stackswitcher headerbar button.circular-button, headerbar stackswitcher button.circular-button, stackswitcher .nemo-window .primary-toolbar button.circular-button, .nemo-window .primary-toolbar stackswitcher button.circular-button, stackswitcher row button.circular-button, row stackswitcher button.circular-button, stackswitcher button.nautilus-circular-button.image-button,
+stackswitcher button.text-button.circular,
+stackswitcher headerbar button.text-button.circular-button, headerbar
+stackswitcher button.text-button.circular-button,
+stackswitcher .nemo-window .primary-toolbar button.text-button.circular-button, .nemo-window .primary-toolbar
+stackswitcher button.text-button.circular-button,
+stackswitcher row button.text-button.circular-button, row
+stackswitcher button.text-button.circular-button,
+stackswitcher button.text-button.nautilus-circular-button.image-button {
+  min-width: 28px;
+  min-height: 28px;
+  border-radius: 100px;
+  -gtk-outline-radius: 100px;
+  padding: 0;
 }
 
 *:drop(active):focus,
@@ -5691,7 +5703,6 @@ gf-candidate-box:hover, gf-candidate-box:selected {
 }
 
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5731,7 +5742,6 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:activ
 window.solid-csd > box.vertical > box.vertical > .horizontal.inline-toolbar button:active,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked,
 window.solid-csd > box.vertical > box.vertical > .horizontal.inline-toolbar button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5758,7 +5768,6 @@ window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > bu
 }
 
 window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:active, window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem .linked > button.image-button.raised:active, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked, window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem .linked > button.image-button.raised:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5792,7 +5801,6 @@ window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked >
 window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):active,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked,
 window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5825,7 +5833,6 @@ window.background > grid.vertical > box.vertical grid.math-buttons button {
 window.background > grid.vertical > box.vertical > widget button:not(.suggested-action):active,
 window.background > grid.vertical > box.vertical > box.vertical > widget button:not(.suggested-action):active,
 window.background > grid.vertical > box.vertical grid.math-buttons button:not(.suggested-action):active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5836,7 +5843,6 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
 window.background > grid.vertical > box.vertical > widget button:not(.suggested-action):checked,
 window.background > grid.vertical > box.vertical > box.vertical > widget button:not(.suggested-action):checked,
 window.background > grid.vertical > box.vertical grid.math-buttons button:not(.suggested-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
@@ -5899,7 +5905,6 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar
 }
 
 popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-action):not(.suggested-action):only-child:active, popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-action):not(.suggested-action):only-child:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -5928,7 +5933,6 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > row.activatable:active, .budgie-menu popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > button:active, popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > row.activatable:checked, .budgie-menu popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background > button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -6408,13 +6412,12 @@ window.background.chromium headerbar.titlebar button.toggle {
 }
 
 window.background.chromium headerbar.titlebar button.toggle:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -7425,13 +7428,12 @@ filechooser placessidebar.sidebar scrollbar trough,
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:hover, .budgie-popover:not(.budgie-menu) button.flat:hover:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:hover:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:hover:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:hover:not(.image-button), .workspace-switcher .workspace-add-button:hover, .raven .raven-header:not(.top) button:hover, .raven-mpris button.image-button:hover, .drop-shadow button:hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:checked:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:checked:not(.image-button), .workspace-switcher .workspace-add-button:checked, .raven .raven-header:not(.top) button:checked, .raven-mpris button.image-button:checked, .drop-shadow button:checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
@@ -7440,7 +7442,6 @@ filechooser placessidebar.sidebar scrollbar trough,
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:active:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven .raven-header:not(.top) button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
@@ -7450,7 +7451,6 @@ filechooser placessidebar.sidebar scrollbar trough,
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven .raven-header:not(.top) button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
   background-color: transparent;
-  border: none;
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button) label, .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button) label, .workspace-switcher .workspace-add-button:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven-mpris button.image-button:disabled label, .drop-shadow button:disabled label, .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .budgie-panel #tasklist-button:disabled:not(.image-button), .budgie-panel .budgie-popover:not(.budgie-menu) #tasklist-button:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven .raven-header:not(.top) button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8127,15 +8127,14 @@ window.budgie-switcher-window flowboxchild {
 }
 
 .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):hover {
-  border: none;
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
   border-color: rgba(0, 0, 0, 0.11);
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
 .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):active, .budgie-session-dialog .linked.horizontal > button:not(.suggested-action):not(.destructive-action):checked {
-  border: none;
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index 962a037..ee209e6 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -1650,15 +1650,15 @@ window.background:not(.csd):not(.solid-csd) {
 
 window.background:not(.solid-csd) {
     // for 'Notebookbar' toolbar
-    > notebook:not(.frame) {
-        border: 0 none transparent; // unset borders
-        background-color: $base_color;
+  > notebook:not(.frame) {
+    border: 0 none transparent; // unset borders
+    background-color: $base_color;
 
-        > stack {
-            border: none;
-            box-shadow: none;
-        }
+    > stack {
+      border: none;
+      box-shadow: none;
     }
+  }
 }
 
 // /************
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 60733f3..4a3cda3 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -379,11 +379,10 @@ $_dot_color: $selected_bg_color;
   }
 }
 
-%outline_solid,
-button:not(.flat):not(.osd) {
+@at-root %outline_solid, button {
   outline-color: $entry_highlight;
   outline-style: solid;
-  outline-offset: -1px;
+  outline-offset: 0;
   outline-width: 3px;
   -gtk-outline-radius: $bt_radius + 1px;
 }
@@ -395,11 +394,18 @@ button {
   border: 1px solid;
   border-radius: $bt_radius;
   padding: 0 6px;
-
   @include button(normal);
 
   separator { margin: 4px 1px; }
 
+  @at-root %outline_dashed,
+  &.flat, &.osd, &.sidebar-button, &.circular-button {
+    outline-color: gtkalpha(currentColor, 0.3);
+    outline-style: dashed;
+    outline-offset: -3px;
+    outline-width: 1px;
+  }
+
   &.flat {
     @include button(flat-normal);
     // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set
@@ -630,17 +636,9 @@ button {
   .linked.vertical > &:active,
   .linked.vertical > &:checked { @extend %linked_vertical; }
 
-  // reset some buttons outline style
-  %outline_dashed,
-  &.image-button,
-  .linked.vertical > &,
-  .linked:not(.vertical) > & {
-      outline-color: gtkalpha(currentColor, 0.3);
-      outline-style: dashed;
-      outline-offset: -3px;
-      outline-width: 1px;
-      -gtk-outline-radius: $bt_radius;
-  }
+  // reset some linked buttons outline style
+  .linked:not(.vertical) > &,
+  .linked.vertical > & { @extend %outline_dashed; }
 }
 
 // all the following is for the +|- buttons on inline toolbars, that way
@@ -956,6 +954,7 @@ spinbutton {
 // Comboboxes
 //
 combobox {
+  @extend %outline_dashed;
   button.combo {
     min-width: 0;       // otherwise the arrow placement is unsymmetric
 //    margin: 0;
@@ -1345,6 +1344,9 @@ headerbar {
   button {
     min-width: 22px;
     @include button(header-normal);
+
+    &.circular-button { @extend button.circular; }
+
     &:backdrop { opacity: 0.7; box-shadow: none; background-image: none; }
     &:hover {
       @include button(header-hover);
@@ -1995,6 +1997,8 @@ popover.background {
       border: 1px solid if($variant=='light', darken($borders_color, 5%), lighten($borders_color, 5%));
     }
 
+  button { @extend %outline_dashed; }
+
   separator,
   & separator,
   .csd & separator {
@@ -2956,7 +2960,6 @@ separator {
 list {
   background-color: $base_color;
   border-color: $borders_color;
-  @extend %outline_solid;
 //  border-radius: $wm_radius;
 
   row { padding: 2px; }
@@ -2965,6 +2968,8 @@ list {
 row {
   &:not(:hover) { transition: all 300ms $ease-out-quad; }
 
+  button.circular-button { @extend button.circular; }
+
   &:selected {
     @extend %selected_items;
 
@@ -3012,7 +3017,6 @@ row {
     min-height: 24px;
     min-width: 24px;
     border-radius: 100px;
-    outline-offset: -1px;
     -gtk-outline-radius: 100px;
 
     &:hover { @include button(flat-hover); }
@@ -3218,16 +3222,19 @@ placessidebar {
       &:dir(rtl) { padding-left: 2px; }
     }
 
-    button.sidebar-button {
+    @at-root button.sidebar-button {
       min-width: 22px;
       min-height: 22px;
       margin-top: 2px;
       margin-bottom: 2px;
       padding: 0;
-//      @extend button.flat;
-      border-radius: 100%;
-      -gtk-outline-radius: 100%;
+      border-radius: 100px;
+      -gtk-outline-radius: 100px;
 
+      &:active, &:checked {
+        @include button(flat-checked);
+        border-color: if($variant=='light', rgba(black, 0.35), rgba(white, 0.35));
+      }
       &:not(:hover):not(:active) > image { opacity: 0.5 };
     }
 
@@ -3570,11 +3577,10 @@ button.circular-button {
   border: none;
   @if $variant=='light' { box-shadow: $shadow_3, 0 0 0 1px $borders_color, inset 0 0 0 1px rgba($borders_color, 0.01); }
 
-  &:active { @include button(flat-active); }
-  &:checked { @include button(flat-checked); }
+  &:active { @include button(flat-active); border: none; }
+  &:checked { @include button(flat-checked); border: none; }
 
   label { padding: 0; }
-
 }
 
 .keycap {
@@ -3592,7 +3598,15 @@ button.circular-button {
 
 stackswitcher button {
   &.text-button { min-width: 80px; }
-  &.circular { min-width: 0; }
+}
+
+stackswitcher button.circular,
+stackswitcher button.text-button.circular { // FIXME aggregate with buttons
+  min-width: 28px;
+  min-height: 28px;
+  border-radius: 100px;
+  -gtk-outline-radius: 100px;
+  padding: 0;
 }
 
 //
diff --git a/src/gtk-3.0/sass/_drawing.scss b/src/gtk-3.0/sass/_drawing.scss
index 24c36be..b1584c9 100644
--- a/src/gtk-3.0/sass/_drawing.scss
+++ b/src/gtk-3.0/sass/_drawing.scss
@@ -234,16 +234,15 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
   //
   // hovered button
   //
-    border: none;
     color: darken($fg_color, 10%);
     background-color: if($variant=='light', rgba(black, 0.15), rgba(white, 0.15));
+    border-color: if($variant=='light', rgba(black, 0.15), rgba(white, 0.15));
   }
 
   @else if $t==flat-active {
   //
   // pushed button
   //
-    border: none;
     background-image: none;
     color: $selected_fg_color;
     background-color: if($variant=='light', rgba(black, 0.5), rgba(white, 0.25));
@@ -255,7 +254,6 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
   //
   // pushed button
   //
-    border: none;
     background-image: none;
     color: $selected_fg_color;
     background-color: if($variant=='light', rgba(black, 0.65), rgba(white, 0.35));
@@ -270,7 +268,7 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
     label, & { color: $insensitive_fg_color; }
 
     background-color: transparent;
-    border: none;
+//    border: none;
   }
 
   @else if $t==flat-insensitive-active {
@@ -280,7 +278,7 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
     label, & { color: transparentize($selected_fg_color, 0.2); }
 
     background-color: lighten($fg_color, 20%);
-    border: none;
+    border-color: lighten($fg_color, 20%);
     opacity: 0.6;
   }