From 0a37c272cae230ba6d9019c10b33c64b51200d03 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 3 Jun 2018 11:51:36 +0800
Subject: [PATCH] Fixed bugs

---
 src/gtk-3.0/gtk-compact-dark-solid-thin.css  | 17 +++++------------
 src/gtk-3.0/gtk-compact-dark-solid.css       | 17 +++++------------
 src/gtk-3.0/gtk-compact-dark-thin.css        | 17 +++++------------
 src/gtk-3.0/gtk-compact-dark.css             | 17 +++++------------
 src/gtk-3.0/gtk-compact-light-solid-thin.css | 17 +++++------------
 src/gtk-3.0/gtk-compact-light-solid.css      | 17 +++++------------
 src/gtk-3.0/gtk-compact-light-thin.css       | 17 +++++------------
 src/gtk-3.0/gtk-compact-light.css            | 17 +++++------------
 src/gtk-3.0/gtk-dark-solid-thin.css          | 17 +++++------------
 src/gtk-3.0/gtk-dark-solid.css               | 17 +++++------------
 src/gtk-3.0/gtk-dark-thin.css                | 17 +++++------------
 src/gtk-3.0/gtk-dark.css                     | 17 +++++------------
 src/gtk-3.0/gtk-light-solid-thin.css         | 17 +++++------------
 src/gtk-3.0/gtk-light-solid.css              | 17 +++++------------
 src/gtk-3.0/gtk-light-thin.css               | 17 +++++------------
 src/gtk-3.0/gtk-light.css                    | 17 +++++------------
 src/gtk-3.0/sass/_budgie.scss                | 12 ++++++------
 src/gtk-3.0/sass/_common.scss                | 16 +++++++---------
 18 files changed, 93 insertions(+), 207 deletions(-)

diff --git a/src/gtk-3.0/gtk-compact-dark-solid-thin.css b/src/gtk-3.0/gtk-compact-dark-solid-thin.css
index 139c32a..4264c66 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid-thin.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid-thin.css
@@ -2392,7 +2392,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: #333333;
   border-radius: 0 0 6px 6px;
 }
 
@@ -2414,7 +2413,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: #333333;
-  border: 1px solid #4B4B4B;
 }
 
 menu separator,
@@ -2422,7 +2420,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(255, 255, 255, 0.08);
   background-color: transparent;
@@ -2434,13 +2432,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #498dff;
+  box-shadow: inset 0 -1px #166dff;
   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);
 }
 
@@ -2513,7 +2511,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #4B4B4B;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2521,7 +2519,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #4B4B4B;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4825,7 +4823,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(255, 255, 255, 0.12);
 }
 
 tooltip.csd decoration {
@@ -8102,11 +8100,6 @@ popover.background.places-menu row {
   background-color: rgba(222, 222, 222, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(255, 255, 255, 0.12);
-  border-top-color: #333333;
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-dark-solid.css b/src/gtk-3.0/gtk-compact-dark-solid.css
index 69b5c78..0badba2 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid.css
@@ -2392,7 +2392,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: #333333;
   border-radius: 0 0 6px 6px;
 }
 
@@ -2414,7 +2413,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: #333333;
-  border: 1px solid #4B4B4B;
 }
 
 menu separator,
@@ -2422,7 +2420,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(255, 255, 255, 0.08);
   background-color: transparent;
@@ -2434,13 +2432,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #498dff;
+  box-shadow: inset 0 -1px #166dff;
   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);
 }
 
@@ -2513,7 +2511,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #4B4B4B;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2521,7 +2519,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #4B4B4B;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4825,7 +4823,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(255, 255, 255, 0.12);
 }
 
 tooltip.csd decoration {
@@ -8102,11 +8100,6 @@ popover.background.places-menu row {
   background-color: rgba(222, 222, 222, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(255, 255, 255, 0.12);
-  border-top-color: #333333;
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-dark-thin.css b/src/gtk-3.0/gtk-compact-dark-thin.css
index 064bf81..6c1740b 100644
--- a/src/gtk-3.0/gtk-compact-dark-thin.css
+++ b/src/gtk-3.0/gtk-compact-dark-thin.css
@@ -2392,7 +2392,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: rgba(51, 51, 51, 0.98);
   border-radius: 0 0 6px 6px;
 }
 
@@ -2414,7 +2413,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: rgba(51, 51, 51, 0.98);
-  border: 1px solid #4B4B4B;
 }
 
 menu separator,
@@ -2422,7 +2420,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(255, 255, 255, 0.08);
   background-color: transparent;
@@ -2434,13 +2432,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #498dff;
+  box-shadow: inset 0 -1px #166dff;
   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);
 }
 
@@ -2513,7 +2511,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #4B4B4B;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2521,7 +2519,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #4B4B4B;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4825,7 +4823,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(255, 255, 255, 0.12);
 }
 
 tooltip.csd decoration {
@@ -8102,11 +8100,6 @@ popover.background.places-menu row {
   background-color: rgba(222, 222, 222, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(255, 255, 255, 0.12);
-  border-top-color: rgba(51, 51, 51, 0.98);
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-dark.css b/src/gtk-3.0/gtk-compact-dark.css
index 1db0468..215d71e 100644
--- a/src/gtk-3.0/gtk-compact-dark.css
+++ b/src/gtk-3.0/gtk-compact-dark.css
@@ -2392,7 +2392,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: rgba(51, 51, 51, 0.98);
   border-radius: 0 0 6px 6px;
 }
 
@@ -2414,7 +2413,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: rgba(51, 51, 51, 0.98);
-  border: 1px solid #4B4B4B;
 }
 
 menu separator,
@@ -2422,7 +2420,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(255, 255, 255, 0.08);
   background-color: transparent;
@@ -2434,13 +2432,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #498dff;
+  box-shadow: inset 0 -1px #166dff;
   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);
 }
 
@@ -2513,7 +2511,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #4B4B4B;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2521,7 +2519,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #4B4B4B;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4825,7 +4823,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(255, 255, 255, 0.12);
 }
 
 tooltip.csd decoration {
@@ -8102,11 +8100,6 @@ popover.background.places-menu row {
   background-color: rgba(222, 222, 222, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(255, 255, 255, 0.12);
-  border-top-color: rgba(51, 51, 51, 0.98);
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-light-solid-thin.css b/src/gtk-3.0/gtk-compact-light-solid-thin.css
index a83c046..11b0df3 100644
--- a/src/gtk-3.0/gtk-compact-light-solid-thin.css
+++ b/src/gtk-3.0/gtk-compact-light-solid-thin.css
@@ -2396,7 +2396,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: #ffffff;
   border-radius: 0 0 6px 6px;
 }
 
@@ -2418,7 +2417,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: #ffffff;
-  border: 1px solid #E1E1E1;
 }
 
 menu separator,
@@ -2426,7 +2424,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(0, 0, 0, 0.05);
   background-color: transparent;
@@ -2438,13 +2436,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #0046DB;
+  box-shadow: inset 0 -1px #0036a8;
   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);
 }
 
@@ -2517,7 +2515,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #E1E1E1;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2525,7 +2523,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #E1E1E1;
+  border-top: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4835,7 +4833,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.11);
 }
 
 tooltip.csd decoration {
@@ -8118,11 +8116,6 @@ popover.background.places-menu row {
   background-color: rgba(36, 36, 36, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: #ffffff;
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-light-solid.css b/src/gtk-3.0/gtk-compact-light-solid.css
index bccc248..72f60dc 100644
--- a/src/gtk-3.0/gtk-compact-light-solid.css
+++ b/src/gtk-3.0/gtk-compact-light-solid.css
@@ -2396,7 +2396,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: #ffffff;
   border-radius: 0 0 6px 6px;
 }
 
@@ -2418,7 +2417,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: #ffffff;
-  border: 1px solid #E1E1E1;
 }
 
 menu separator,
@@ -2426,7 +2424,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(0, 0, 0, 0.05);
   background-color: transparent;
@@ -2438,13 +2436,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #0046DB;
+  box-shadow: inset 0 -1px #0036a8;
   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);
 }
 
@@ -2517,7 +2515,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #E1E1E1;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2525,7 +2523,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #E1E1E1;
+  border-top: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4835,7 +4833,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.11);
 }
 
 tooltip.csd decoration {
@@ -8118,11 +8116,6 @@ popover.background.places-menu row {
   background-color: rgba(36, 36, 36, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: #ffffff;
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-light-thin.css b/src/gtk-3.0/gtk-compact-light-thin.css
index 3d1184f..416d8cf 100644
--- a/src/gtk-3.0/gtk-compact-light-thin.css
+++ b/src/gtk-3.0/gtk-compact-light-thin.css
@@ -2396,7 +2396,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: rgba(255, 255, 255, 0.95);
   border-radius: 0 0 6px 6px;
 }
 
@@ -2418,7 +2417,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: rgba(255, 255, 255, 0.95);
-  border: 1px solid #E1E1E1;
 }
 
 menu separator,
@@ -2426,7 +2424,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(0, 0, 0, 0.05);
   background-color: transparent;
@@ -2438,13 +2436,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #0046DB;
+  box-shadow: inset 0 -1px #0036a8;
   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);
 }
 
@@ -2517,7 +2515,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #E1E1E1;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2525,7 +2523,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #E1E1E1;
+  border-top: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4835,7 +4833,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.11);
 }
 
 tooltip.csd decoration {
@@ -8118,11 +8116,6 @@ popover.background.places-menu row {
   background-color: rgba(36, 36, 36, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: rgba(255, 255, 255, 0.95);
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-light.css b/src/gtk-3.0/gtk-compact-light.css
index 0d66aa8..d024e8c 100644
--- a/src/gtk-3.0/gtk-compact-light.css
+++ b/src/gtk-3.0/gtk-compact-light.css
@@ -2396,7 +2396,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: rgba(255, 255, 255, 0.95);
   border-radius: 0 0 6px 6px;
 }
 
@@ -2418,7 +2417,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: rgba(255, 255, 255, 0.95);
-  border: 1px solid #E1E1E1;
 }
 
 menu separator,
@@ -2426,7 +2424,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(0, 0, 0, 0.05);
   background-color: transparent;
@@ -2438,13 +2436,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #0046DB;
+  box-shadow: inset 0 -1px #0036a8;
   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);
 }
 
@@ -2517,7 +2515,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #E1E1E1;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2525,7 +2523,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #E1E1E1;
+  border-top: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4835,7 +4833,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.11);
 }
 
 tooltip.csd decoration {
@@ -8118,11 +8116,6 @@ popover.background.places-menu row {
   background-color: rgba(36, 36, 36, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: rgba(255, 255, 255, 0.95);
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-dark-solid-thin.css b/src/gtk-3.0/gtk-dark-solid-thin.css
index 4f0a26b..ea1a95f 100644
--- a/src/gtk-3.0/gtk-dark-solid-thin.css
+++ b/src/gtk-3.0/gtk-dark-solid-thin.css
@@ -2390,7 +2390,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: #333333;
   border-radius: 0 0 6px 6px;
 }
 
@@ -2412,7 +2411,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: #333333;
-  border: 1px solid #4B4B4B;
 }
 
 menu separator,
@@ -2420,7 +2418,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(255, 255, 255, 0.08);
   background-color: transparent;
@@ -2432,13 +2430,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #498dff;
+  box-shadow: inset 0 -1px #166dff;
   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);
 }
 
@@ -2511,7 +2509,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #4B4B4B;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2519,7 +2517,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #4B4B4B;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4823,7 +4821,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(255, 255, 255, 0.12);
 }
 
 tooltip.csd decoration {
@@ -8102,11 +8100,6 @@ popover.background.places-menu row {
   background-color: rgba(222, 222, 222, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(255, 255, 255, 0.12);
-  border-top-color: #333333;
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
index d102a26..29b1c4e 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -2390,7 +2390,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: #333333;
   border-radius: 0 0 6px 6px;
 }
 
@@ -2412,7 +2411,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: #333333;
-  border: 1px solid #4B4B4B;
 }
 
 menu separator,
@@ -2420,7 +2418,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(255, 255, 255, 0.08);
   background-color: transparent;
@@ -2432,13 +2430,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #498dff;
+  box-shadow: inset 0 -1px #166dff;
   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);
 }
 
@@ -2511,7 +2509,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #4B4B4B;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2519,7 +2517,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #4B4B4B;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4823,7 +4821,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(255, 255, 255, 0.12);
 }
 
 tooltip.csd decoration {
@@ -8102,11 +8100,6 @@ popover.background.places-menu row {
   background-color: rgba(222, 222, 222, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(255, 255, 255, 0.12);
-  border-top-color: #333333;
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-dark-thin.css b/src/gtk-3.0/gtk-dark-thin.css
index efddde2..5569e26 100644
--- a/src/gtk-3.0/gtk-dark-thin.css
+++ b/src/gtk-3.0/gtk-dark-thin.css
@@ -2390,7 +2390,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: rgba(51, 51, 51, 0.98);
   border-radius: 0 0 6px 6px;
 }
 
@@ -2412,7 +2411,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: rgba(51, 51, 51, 0.98);
-  border: 1px solid #4B4B4B;
 }
 
 menu separator,
@@ -2420,7 +2418,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(255, 255, 255, 0.08);
   background-color: transparent;
@@ -2432,13 +2430,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #498dff;
+  box-shadow: inset 0 -1px #166dff;
   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);
 }
 
@@ -2511,7 +2509,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #4B4B4B;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2519,7 +2517,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #4B4B4B;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4823,7 +4821,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(255, 255, 255, 0.12);
 }
 
 tooltip.csd decoration {
@@ -8102,11 +8100,6 @@ popover.background.places-menu row {
   background-color: rgba(222, 222, 222, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(255, 255, 255, 0.12);
-  border-top-color: rgba(51, 51, 51, 0.98);
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index 249db69..df342c8 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -2390,7 +2390,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: rgba(51, 51, 51, 0.98);
   border-radius: 0 0 6px 6px;
 }
 
@@ -2412,7 +2411,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: rgba(51, 51, 51, 0.98);
-  border: 1px solid #4B4B4B;
 }
 
 menu separator,
@@ -2420,7 +2418,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(255, 255, 255, 0.08);
   background-color: transparent;
@@ -2432,13 +2430,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #498dff;
+  box-shadow: inset 0 -1px #166dff;
   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);
 }
 
@@ -2511,7 +2509,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #4B4B4B;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2519,7 +2517,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #4B4B4B;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4823,7 +4821,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(255, 255, 255, 0.12);
 }
 
 tooltip.csd decoration {
@@ -8102,11 +8100,6 @@ popover.background.places-menu row {
   background-color: rgba(222, 222, 222, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(255, 255, 255, 0.12);
-  border-top-color: rgba(51, 51, 51, 0.98);
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-light-solid-thin.css b/src/gtk-3.0/gtk-light-solid-thin.css
index 21ad15d..0203134 100644
--- a/src/gtk-3.0/gtk-light-solid-thin.css
+++ b/src/gtk-3.0/gtk-light-solid-thin.css
@@ -2412,7 +2412,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: #ffffff;
   border-radius: 0 0 6px 6px;
 }
 
@@ -2434,7 +2433,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: #ffffff;
-  border: 1px solid #E1E1E1;
 }
 
 menu separator,
@@ -2442,7 +2440,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(0, 0, 0, 0.05);
   background-color: transparent;
@@ -2454,13 +2452,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #0046DB;
+  box-shadow: inset 0 -1px #0036a8;
   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);
 }
 
@@ -2533,7 +2531,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #E1E1E1;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2541,7 +2539,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #E1E1E1;
+  border-top: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4851,7 +4849,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.11);
 }
 
 tooltip.csd decoration {
@@ -8130,11 +8128,6 @@ popover.background.places-menu row {
   background-color: rgba(36, 36, 36, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: #ffffff;
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
index 9f9695d..a1323a9 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -2412,7 +2412,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: #ffffff;
   border-radius: 0 0 6px 6px;
 }
 
@@ -2434,7 +2433,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: #ffffff;
-  border: 1px solid #E1E1E1;
 }
 
 menu separator,
@@ -2442,7 +2440,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(0, 0, 0, 0.05);
   background-color: transparent;
@@ -2454,13 +2452,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #0046DB;
+  box-shadow: inset 0 -1px #0036a8;
   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);
 }
 
@@ -2533,7 +2531,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #E1E1E1;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2541,7 +2539,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #E1E1E1;
+  border-top: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4851,7 +4849,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.11);
 }
 
 tooltip.csd decoration {
@@ -8130,11 +8128,6 @@ popover.background.places-menu row {
   background-color: rgba(36, 36, 36, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: #ffffff;
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-light-thin.css b/src/gtk-3.0/gtk-light-thin.css
index 434ed6b..4a524ae 100644
--- a/src/gtk-3.0/gtk-light-thin.css
+++ b/src/gtk-3.0/gtk-light-thin.css
@@ -2412,7 +2412,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: rgba(255, 255, 255, 0.95);
   border-radius: 0 0 6px 6px;
 }
 
@@ -2434,7 +2433,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: rgba(255, 255, 255, 0.95);
-  border: 1px solid #E1E1E1;
 }
 
 menu separator,
@@ -2442,7 +2440,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(0, 0, 0, 0.05);
   background-color: transparent;
@@ -2454,13 +2452,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #0046DB;
+  box-shadow: inset 0 -1px #0036a8;
   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);
 }
 
@@ -2533,7 +2531,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #E1E1E1;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2541,7 +2539,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #E1E1E1;
+  border-top: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4851,7 +4849,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.11);
 }
 
 tooltip.csd decoration {
@@ -8130,11 +8128,6 @@ popover.background.places-menu row {
   background-color: rgba(36, 36, 36, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: rgba(255, 255, 255, 0.95);
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index f07899d..ed219a5 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -2412,7 +2412,6 @@ menubar > menuitem,
 
 menubar > menuitem menu,
 .menubar > menuitem menu {
-  border-top-color: rgba(255, 255, 255, 0.95);
   border-radius: 0 0 6px 6px;
 }
 
@@ -2434,7 +2433,6 @@ menu,
   padding: 6px 0;
   border-radius: 6px;
   background-color: rgba(255, 255, 255, 0.95);
-  border: 1px solid #E1E1E1;
 }
 
 menu separator,
@@ -2442,7 +2440,7 @@ menu separator,
 .menu separator,
 .csd
 .menu separator {
-  margin: 2px 1px;
+  margin: 2px 0;
   min-height: 0;
   border-bottom: 2px solid rgba(0, 0, 0, 0.05);
   background-color: transparent;
@@ -2454,13 +2452,13 @@ menu menuitem,
   min-width: 40px;
   padding: 2px 6px;
   text-shadow: none;
-  border: 1px solid transparent;
 }
 
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
   background-color: #0046DB;
+  box-shadow: inset 0 -1px #0036a8;
   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);
 }
 
@@ -2533,7 +2531,7 @@ menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
   border-radius: 6px 6px 0 0;
-  border: 1px solid #E1E1E1;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -2541,7 +2539,7 @@ menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
   border-radius: 0 0 6px 6px;
-  border: 1px solid #E1E1E1;
+  border-top: 1px solid rgba(0, 0, 0, 0.11);
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -4851,7 +4849,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.11);
 }
 
 tooltip.csd decoration {
@@ -8130,11 +8128,6 @@ popover.background.places-menu row {
   background-color: rgba(36, 36, 36, 0.15);
 }
 
-window.background:not(.csd) menu {
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: rgba(255, 255, 255, 0.95);
-}
-
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #0e6bff 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
diff --git a/src/gtk-3.0/sass/_budgie.scss b/src/gtk-3.0/sass/_budgie.scss
index 432f4b8..e002970 100644
--- a/src/gtk-3.0/sass/_budgie.scss
+++ b/src/gtk-3.0/sass/_budgie.scss
@@ -421,12 +421,12 @@ popover.background.places-menu {
   .pinned button.flat.launcher.running { @extend %underscores:checked; }
 }
 
-window.background:not(.csd) {
-  menu { // menubar context-menus
-    border-color: $borders_color;
-    border-top-color: $_menu_bg;
-  }
-}
+//window.background:not(.csd) {
+//  menu { // menubar context-menus
+//    border-color: $borders_color;
+//    border-top-color: $_menu_bg;
+//  }
+//}
 
 %underscores {
   @each $pos, $b_pos, $b_wid in (top,    center calc(1px),        2 0 0 0 / 2px 0 0 0),
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index af3e46d..fa32c47 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -1874,7 +1874,6 @@ menubar,
     padding: 4px 8px;
 
     menu {
-      border-top-color: $_menu_bg;
       border-radius: 0 0 $wm_radius $wm_radius;
     }
 
@@ -1898,16 +1897,15 @@ menu,
   padding: 6px 0;
   border-radius: $wm_radius;
   background-color: $_menu_bg;
-  border: 1px solid $bar_border;
+//  box-shadow: inset 0 0 0 1px $borders_color;
 
   .csd & {
 //    background-color: $_menu_bg;
-//    border: 1px solid $bar_border;
   }
 
   separator,
   .csd & separator {
-    margin: 2px 1px;
+    margin: 2px 0;
     min-height: 0;
     border-bottom: 2px solid $_menu_bd;
     background-color: transparent;
@@ -1923,11 +1921,11 @@ menu,
     min-width: 40px;
     padding: 2px 6px;
     text-shadow: none;
-    border: 1px solid transparent;
 
     &:hover {
       color: $selected_fg_color;
       background-color: $selected_bg_color;
+      box-shadow: inset 0 -1px darken($selected_bg_color, 10%);
       text-shadow: $text_shadow;
 
       arrow {
@@ -1984,14 +1982,14 @@ menu,
     &.top {
       margin: -8px 0 0 0;
       border-radius: $wm_radius $wm_radius 0 0;
-      border: 1px solid $bar_border;
+      border-bottom: 1px solid $borders_color;
       -gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
     }
 
     &.bottom {
       margin: 0 0 -18px 0;
       border-radius: 0 0 $wm_radius $wm_radius;
-      border: 1px solid $bar_border;
+      border-top: 1px solid $borders_color;
       -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
     }
 
@@ -3716,7 +3714,7 @@ decoration {
                 0 0 0 1px $borders_color;
   }
   .popup & {
-//   box-shadow: none;
+//    box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px $borders_color;
     border-radius: $wm_radius;
   }
   // server-side decorations as used by mutter
@@ -3728,7 +3726,7 @@ decoration {
   }
   .csd.popup & {
     border-radius: $wm_radius;
-    box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06);
+    box-shadow: 0 3px 5px rgba(0, 0, 0, 0.12), 0 5px 5px rgba(0, 0, 0, 0.06), 0 0 0 1px $borders_color;
   }
   tooltip.csd & {
     border-radius: $wm_radius;