diff --git a/src/gtk-3.0/gtk-compact-dark-solid.css b/src/gtk-3.0/gtk-compact-dark-solid.css
index 9c28cf3..4521137 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid.css
@@ -2415,8 +2415,6 @@ menubar > menuitem:disabled,
   border-color: transparent;
 }
 
-.context-menu, popover.touch-selection, .csd popover.touch-selection,
-popover.background.touch-selection, .csd popover.background.touch-selection,
 menu,
 .menu {
   padding: 6px 0;
@@ -2425,19 +2423,15 @@ menu,
   border: 1px solid #4B4B4B;
 }
 
-.csd .context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
-menu, .csd
+.csd menu, .csd
 .menu {
+  border-radius: 6px;
   background-color: #333333;
+  border: 1px solid #4B4B4B;
 }
 
-.context-menu separator, popover.touch-selection separator, .csd popover.touch-selection separator, popover.background.touch-selection separator, .csd popover.background.touch-selection separator,
-.csd .context-menu separator,
-.csd popover.touch-selection separator,
-.csd popover.background.touch-selection separator,
-menu separator,
-.csd
 menu separator,
+.csd menu separator,
 .menu separator,
 .csd
 .menu separator {
@@ -2447,7 +2441,6 @@ menu separator,
   background-color: transparent;
 }
 
-.context-menu menuitem, popover.touch-selection menuitem, .csd popover.touch-selection menuitem, popover.background.touch-selection menuitem, .csd popover.background.touch-selection menuitem,
 menu menuitem,
 .menu menuitem {
   min-height: 12px;
@@ -2457,7 +2450,6 @@ menu menuitem,
   border: 1px solid transparent;
 }
 
-.context-menu menuitem:hover, popover.touch-selection menuitem:hover, .csd popover.background.touch-selection menuitem:hover,
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
@@ -2465,7 +2457,6 @@ menu menuitem:hover,
   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);
 }
 
-.context-menu menuitem:hover arrow, popover.touch-selection menuitem:hover arrow, .csd popover.background.touch-selection menuitem:hover arrow,
 menu menuitem:hover arrow,
 .menu menuitem:hover arrow {
   transition: none;
@@ -2473,13 +2464,11 @@ menu menuitem:hover arrow,
   -gtk-icon-shadow: none;
 }
 
-.context-menu menuitem:disabled, popover.touch-selection menuitem:disabled, .csd popover.background.touch-selection menuitem:disabled,
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
 }
 
-.context-menu menuitem arrow, popover.touch-selection menuitem arrow, .csd popover.touch-selection menuitem arrow, popover.background.touch-selection menuitem arrow, .csd popover.background.touch-selection menuitem arrow,
 menu menuitem arrow,
 .menu menuitem arrow {
   min-height: 16px;
@@ -2490,14 +2479,12 @@ menu menuitem arrow,
   color: #dedede;
 }
 
-.context-menu menuitem arrow:dir(ltr), popover.touch-selection menuitem arrow:dir(ltr), .csd popover.touch-selection menuitem arrow:dir(ltr), popover.background.touch-selection menuitem arrow:dir(ltr), .csd popover.background.touch-selection menuitem arrow:dir(ltr),
 menu menuitem arrow:dir(ltr),
 .menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-right: 0;
 }
 
-.context-menu menuitem arrow:dir(rtl), popover.touch-selection menuitem arrow:dir(rtl), .csd popover.touch-selection menuitem arrow:dir(rtl), popover.background.touch-selection menuitem arrow:dir(rtl), .csd popover.background.touch-selection menuitem arrow:dir(rtl),
 menu menuitem arrow:dir(rtl),
 .menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
@@ -2523,7 +2510,6 @@ menuitem check:dir(rtl), menuitem radio:dir(rtl) {
   margin-right: 2px;
 }
 
-.context-menu > arrow, popover.touch-selection > arrow, .csd popover.touch-selection > arrow, popover.background.touch-selection > arrow, .csd popover.background.touch-selection > arrow,
 menu > arrow,
 .menu > arrow {
   min-width: 16px;
@@ -2536,7 +2522,6 @@ menu > arrow,
   color: #dedede;
 }
 
-.context-menu > arrow.top, popover.touch-selection > arrow.top, .csd popover.touch-selection > arrow.top,
 menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
@@ -2545,7 +2530,6 @@ menu > arrow.top,
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
-.context-menu > arrow.bottom, popover.touch-selection > arrow.bottom, .csd popover.touch-selection > arrow.bottom,
 menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
@@ -2554,13 +2538,11 @@ menu > arrow.bottom,
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
-.context-menu > arrow:hover, popover.touch-selection > arrow:hover, .csd popover.touch-selection > arrow:hover,
 menu > arrow:hover,
 .menu > arrow:hover {
   background-color: #373737;
 }
 
-.context-menu > arrow:disabled, popover.touch-selection > arrow:disabled, .csd popover.touch-selection > arrow:disabled,
 menu > arrow:disabled,
 .menu > arrow:disabled {
   color: transparent;
@@ -6516,7 +6498,7 @@ window.background:not(.csd) > widget > button > button label {
 }
 
 window.background:not(.csd) > menu,
-window.background:not(.csd) .menu, window.background:not(.csd) menu {
+window.background:not(.csd) .menu {
   background-color: #404040;
   border-radius: 0;
   border: none;
@@ -6526,8 +6508,7 @@ window.background:not(.csd) > menu .separator:not(label),
 .csd window.background:not(.csd) > menu .separator:not(label),
 window.background:not(.csd) .menu .separator:not(label),
 .csd
-window.background:not(.csd) .menu .separator:not(label), window.background:not(.csd) menu .separator:not(label),
-.csd window.background:not(.csd) menu .separator:not(label) {
+window.background:not(.csd) .menu .separator:not(label) {
   color: rgba(255, 255, 255, 0.12);
 }
 
@@ -8134,6 +8115,11 @@ 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.css b/src/gtk-3.0/gtk-compact-dark.css
index 1414ad0..b15c2e2 100644
--- a/src/gtk-3.0/gtk-compact-dark.css
+++ b/src/gtk-3.0/gtk-compact-dark.css
@@ -2415,8 +2415,6 @@ menubar > menuitem:disabled,
   border-color: transparent;
 }
 
-.context-menu, popover.touch-selection, .csd popover.touch-selection,
-popover.background.touch-selection, .csd popover.background.touch-selection,
 menu,
 .menu {
   padding: 6px 0;
@@ -2425,19 +2423,15 @@ menu,
   border: 1px solid #4B4B4B;
 }
 
-.csd .context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
-menu, .csd
+.csd menu, .csd
 .menu {
+  border-radius: 6px;
   background-color: rgba(51, 51, 51, 0.98);
+  border: 1px solid #4B4B4B;
 }
 
-.context-menu separator, popover.touch-selection separator, .csd popover.touch-selection separator, popover.background.touch-selection separator, .csd popover.background.touch-selection separator,
-.csd .context-menu separator,
-.csd popover.touch-selection separator,
-.csd popover.background.touch-selection separator,
-menu separator,
-.csd
 menu separator,
+.csd menu separator,
 .menu separator,
 .csd
 .menu separator {
@@ -2447,7 +2441,6 @@ menu separator,
   background-color: transparent;
 }
 
-.context-menu menuitem, popover.touch-selection menuitem, .csd popover.touch-selection menuitem, popover.background.touch-selection menuitem, .csd popover.background.touch-selection menuitem,
 menu menuitem,
 .menu menuitem {
   min-height: 12px;
@@ -2457,7 +2450,6 @@ menu menuitem,
   border: 1px solid transparent;
 }
 
-.context-menu menuitem:hover, popover.touch-selection menuitem:hover, .csd popover.background.touch-selection menuitem:hover,
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
@@ -2465,7 +2457,6 @@ menu menuitem:hover,
   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);
 }
 
-.context-menu menuitem:hover arrow, popover.touch-selection menuitem:hover arrow, .csd popover.background.touch-selection menuitem:hover arrow,
 menu menuitem:hover arrow,
 .menu menuitem:hover arrow {
   transition: none;
@@ -2473,13 +2464,11 @@ menu menuitem:hover arrow,
   -gtk-icon-shadow: none;
 }
 
-.context-menu menuitem:disabled, popover.touch-selection menuitem:disabled, .csd popover.background.touch-selection menuitem:disabled,
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
 }
 
-.context-menu menuitem arrow, popover.touch-selection menuitem arrow, .csd popover.touch-selection menuitem arrow, popover.background.touch-selection menuitem arrow, .csd popover.background.touch-selection menuitem arrow,
 menu menuitem arrow,
 .menu menuitem arrow {
   min-height: 16px;
@@ -2490,14 +2479,12 @@ menu menuitem arrow,
   color: #dedede;
 }
 
-.context-menu menuitem arrow:dir(ltr), popover.touch-selection menuitem arrow:dir(ltr), .csd popover.touch-selection menuitem arrow:dir(ltr), popover.background.touch-selection menuitem arrow:dir(ltr), .csd popover.background.touch-selection menuitem arrow:dir(ltr),
 menu menuitem arrow:dir(ltr),
 .menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-right: 0;
 }
 
-.context-menu menuitem arrow:dir(rtl), popover.touch-selection menuitem arrow:dir(rtl), .csd popover.touch-selection menuitem arrow:dir(rtl), popover.background.touch-selection menuitem arrow:dir(rtl), .csd popover.background.touch-selection menuitem arrow:dir(rtl),
 menu menuitem arrow:dir(rtl),
 .menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
@@ -2523,7 +2510,6 @@ menuitem check:dir(rtl), menuitem radio:dir(rtl) {
   margin-right: 2px;
 }
 
-.context-menu > arrow, popover.touch-selection > arrow, .csd popover.touch-selection > arrow, popover.background.touch-selection > arrow, .csd popover.background.touch-selection > arrow,
 menu > arrow,
 .menu > arrow {
   min-width: 16px;
@@ -2536,7 +2522,6 @@ menu > arrow,
   color: #dedede;
 }
 
-.context-menu > arrow.top, popover.touch-selection > arrow.top, .csd popover.touch-selection > arrow.top,
 menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
@@ -2545,7 +2530,6 @@ menu > arrow.top,
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
-.context-menu > arrow.bottom, popover.touch-selection > arrow.bottom, .csd popover.touch-selection > arrow.bottom,
 menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
@@ -2554,13 +2538,11 @@ menu > arrow.bottom,
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
-.context-menu > arrow:hover, popover.touch-selection > arrow:hover, .csd popover.touch-selection > arrow:hover,
 menu > arrow:hover,
 .menu > arrow:hover {
   background-color: #373737;
 }
 
-.context-menu > arrow:disabled, popover.touch-selection > arrow:disabled, .csd popover.touch-selection > arrow:disabled,
 menu > arrow:disabled,
 .menu > arrow:disabled {
   color: transparent;
@@ -6516,7 +6498,7 @@ window.background:not(.csd) > widget > button > button label {
 }
 
 window.background:not(.csd) > menu,
-window.background:not(.csd) .menu, window.background:not(.csd) menu {
+window.background:not(.csd) .menu {
   background-color: #404040;
   border-radius: 0;
   border: none;
@@ -6526,8 +6508,7 @@ window.background:not(.csd) > menu .separator:not(label),
 .csd window.background:not(.csd) > menu .separator:not(label),
 window.background:not(.csd) .menu .separator:not(label),
 .csd
-window.background:not(.csd) .menu .separator:not(label), window.background:not(.csd) menu .separator:not(label),
-.csd window.background:not(.csd) menu .separator:not(label) {
+window.background:not(.csd) .menu .separator:not(label) {
   color: rgba(255, 255, 255, 0.12);
 }
 
@@ -8134,6 +8115,11 @@ 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.css b/src/gtk-3.0/gtk-compact-light-solid.css
index c036335..9c6181d 100644
--- a/src/gtk-3.0/gtk-compact-light-solid.css
+++ b/src/gtk-3.0/gtk-compact-light-solid.css
@@ -2419,8 +2419,6 @@ menubar > menuitem:disabled,
   border-color: transparent;
 }
 
-.context-menu, popover.touch-selection, .csd popover.touch-selection,
-popover.background.touch-selection, .csd popover.background.touch-selection,
 menu,
 .menu {
   padding: 6px 0;
@@ -2429,19 +2427,15 @@ menu,
   border: 1px solid #E1E1E1;
 }
 
-.csd .context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
-menu, .csd
+.csd menu, .csd
 .menu {
+  border-radius: 6px;
   background-color: #ffffff;
+  border: 1px solid #E1E1E1;
 }
 
-.context-menu separator, popover.touch-selection separator, .csd popover.touch-selection separator, popover.background.touch-selection separator, .csd popover.background.touch-selection separator,
-.csd .context-menu separator,
-.csd popover.touch-selection separator,
-.csd popover.background.touch-selection separator,
-menu separator,
-.csd
 menu separator,
+.csd menu separator,
 .menu separator,
 .csd
 .menu separator {
@@ -2451,7 +2445,6 @@ menu separator,
   background-color: transparent;
 }
 
-.context-menu menuitem, popover.touch-selection menuitem, .csd popover.touch-selection menuitem, popover.background.touch-selection menuitem, .csd popover.background.touch-selection menuitem,
 menu menuitem,
 .menu menuitem {
   min-height: 12px;
@@ -2461,7 +2454,6 @@ menu menuitem,
   border: 1px solid transparent;
 }
 
-.context-menu menuitem:hover, popover.touch-selection menuitem:hover, .csd popover.background.touch-selection menuitem:hover,
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
@@ -2469,7 +2461,6 @@ menu menuitem:hover,
   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);
 }
 
-.context-menu menuitem:hover arrow, popover.touch-selection menuitem:hover arrow, .csd popover.background.touch-selection menuitem:hover arrow,
 menu menuitem:hover arrow,
 .menu menuitem:hover arrow {
   transition: none;
@@ -2477,13 +2468,11 @@ menu menuitem:hover arrow,
   -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);
 }
 
-.context-menu menuitem:disabled, popover.touch-selection menuitem:disabled, .csd popover.background.touch-selection menuitem:disabled,
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
 }
 
-.context-menu menuitem arrow, popover.touch-selection menuitem arrow, .csd popover.touch-selection menuitem arrow, popover.background.touch-selection menuitem arrow, .csd popover.background.touch-selection menuitem arrow,
 menu menuitem arrow,
 .menu menuitem arrow {
   min-height: 16px;
@@ -2494,14 +2483,12 @@ menu menuitem arrow,
   color: #242424;
 }
 
-.context-menu menuitem arrow:dir(ltr), popover.touch-selection menuitem arrow:dir(ltr), .csd popover.touch-selection menuitem arrow:dir(ltr), popover.background.touch-selection menuitem arrow:dir(ltr), .csd popover.background.touch-selection menuitem arrow:dir(ltr),
 menu menuitem arrow:dir(ltr),
 .menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-right: 0;
 }
 
-.context-menu menuitem arrow:dir(rtl), popover.touch-selection menuitem arrow:dir(rtl), .csd popover.touch-selection menuitem arrow:dir(rtl), popover.background.touch-selection menuitem arrow:dir(rtl), .csd popover.background.touch-selection menuitem arrow:dir(rtl),
 menu menuitem arrow:dir(rtl),
 .menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
@@ -2527,7 +2514,6 @@ menuitem check:dir(rtl), menuitem radio:dir(rtl) {
   margin-right: 2px;
 }
 
-.context-menu > arrow, popover.touch-selection > arrow, .csd popover.touch-selection > arrow, popover.background.touch-selection > arrow, .csd popover.background.touch-selection > arrow,
 menu > arrow,
 .menu > arrow {
   min-width: 16px;
@@ -2540,7 +2526,6 @@ menu > arrow,
   color: #242424;
 }
 
-.context-menu > arrow.top, popover.touch-selection > arrow.top, .csd popover.touch-selection > arrow.top,
 menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
@@ -2549,7 +2534,6 @@ menu > arrow.top,
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
-.context-menu > arrow.bottom, popover.touch-selection > arrow.bottom, .csd popover.touch-selection > arrow.bottom,
 menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
@@ -2558,13 +2542,11 @@ menu > arrow.bottom,
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
-.context-menu > arrow:hover, popover.touch-selection > arrow:hover, .csd popover.touch-selection > arrow:hover,
 menu > arrow:hover,
 .menu > arrow:hover {
   background-color: #e9e9e9;
 }
 
-.context-menu > arrow:disabled, popover.touch-selection > arrow:disabled, .csd popover.touch-selection > arrow:disabled,
 menu > arrow:disabled,
 .menu > arrow:disabled {
   color: transparent;
@@ -6521,7 +6503,7 @@ window.background:not(.csd) > widget > button > button label {
 }
 
 window.background:not(.csd) > menu,
-window.background:not(.csd) .menu, window.background:not(.csd) menu {
+window.background:not(.csd) .menu {
   background-color: #ffffff;
   border-radius: 0;
   border: none;
@@ -6531,8 +6513,7 @@ window.background:not(.csd) > menu .separator:not(label),
 .csd window.background:not(.csd) > menu .separator:not(label),
 window.background:not(.csd) .menu .separator:not(label),
 .csd
-window.background:not(.csd) .menu .separator:not(label), window.background:not(.csd) menu .separator:not(label),
-.csd window.background:not(.csd) menu .separator:not(label) {
+window.background:not(.csd) .menu .separator:not(label) {
   color: rgba(0, 0, 0, 0.11);
 }
 
@@ -8150,6 +8131,11 @@ 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.css b/src/gtk-3.0/gtk-compact-light.css
index 56be0c5..9170c4f 100644
--- a/src/gtk-3.0/gtk-compact-light.css
+++ b/src/gtk-3.0/gtk-compact-light.css
@@ -2419,8 +2419,6 @@ menubar > menuitem:disabled,
   border-color: transparent;
 }
 
-.context-menu, popover.touch-selection, .csd popover.touch-selection,
-popover.background.touch-selection, .csd popover.background.touch-selection,
 menu,
 .menu {
   padding: 6px 0;
@@ -2429,19 +2427,15 @@ menu,
   border: 1px solid #E1E1E1;
 }
 
-.csd .context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
-menu, .csd
+.csd menu, .csd
 .menu {
+  border-radius: 6px;
   background-color: rgba(255, 255, 255, 0.95);
+  border: 1px solid #E1E1E1;
 }
 
-.context-menu separator, popover.touch-selection separator, .csd popover.touch-selection separator, popover.background.touch-selection separator, .csd popover.background.touch-selection separator,
-.csd .context-menu separator,
-.csd popover.touch-selection separator,
-.csd popover.background.touch-selection separator,
-menu separator,
-.csd
 menu separator,
+.csd menu separator,
 .menu separator,
 .csd
 .menu separator {
@@ -2451,7 +2445,6 @@ menu separator,
   background-color: transparent;
 }
 
-.context-menu menuitem, popover.touch-selection menuitem, .csd popover.touch-selection menuitem, popover.background.touch-selection menuitem, .csd popover.background.touch-selection menuitem,
 menu menuitem,
 .menu menuitem {
   min-height: 12px;
@@ -2461,7 +2454,6 @@ menu menuitem,
   border: 1px solid transparent;
 }
 
-.context-menu menuitem:hover, popover.touch-selection menuitem:hover, .csd popover.background.touch-selection menuitem:hover,
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
@@ -2469,7 +2461,6 @@ menu menuitem:hover,
   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);
 }
 
-.context-menu menuitem:hover arrow, popover.touch-selection menuitem:hover arrow, .csd popover.background.touch-selection menuitem:hover arrow,
 menu menuitem:hover arrow,
 .menu menuitem:hover arrow {
   transition: none;
@@ -2477,13 +2468,11 @@ menu menuitem:hover arrow,
   -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);
 }
 
-.context-menu menuitem:disabled, popover.touch-selection menuitem:disabled, .csd popover.background.touch-selection menuitem:disabled,
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
 }
 
-.context-menu menuitem arrow, popover.touch-selection menuitem arrow, .csd popover.touch-selection menuitem arrow, popover.background.touch-selection menuitem arrow, .csd popover.background.touch-selection menuitem arrow,
 menu menuitem arrow,
 .menu menuitem arrow {
   min-height: 16px;
@@ -2494,14 +2483,12 @@ menu menuitem arrow,
   color: #242424;
 }
 
-.context-menu menuitem arrow:dir(ltr), popover.touch-selection menuitem arrow:dir(ltr), .csd popover.touch-selection menuitem arrow:dir(ltr), popover.background.touch-selection menuitem arrow:dir(ltr), .csd popover.background.touch-selection menuitem arrow:dir(ltr),
 menu menuitem arrow:dir(ltr),
 .menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-right: 0;
 }
 
-.context-menu menuitem arrow:dir(rtl), popover.touch-selection menuitem arrow:dir(rtl), .csd popover.touch-selection menuitem arrow:dir(rtl), popover.background.touch-selection menuitem arrow:dir(rtl), .csd popover.background.touch-selection menuitem arrow:dir(rtl),
 menu menuitem arrow:dir(rtl),
 .menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
@@ -2527,7 +2514,6 @@ menuitem check:dir(rtl), menuitem radio:dir(rtl) {
   margin-right: 2px;
 }
 
-.context-menu > arrow, popover.touch-selection > arrow, .csd popover.touch-selection > arrow, popover.background.touch-selection > arrow, .csd popover.background.touch-selection > arrow,
 menu > arrow,
 .menu > arrow {
   min-width: 16px;
@@ -2540,7 +2526,6 @@ menu > arrow,
   color: #242424;
 }
 
-.context-menu > arrow.top, popover.touch-selection > arrow.top, .csd popover.touch-selection > arrow.top,
 menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
@@ -2549,7 +2534,6 @@ menu > arrow.top,
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
-.context-menu > arrow.bottom, popover.touch-selection > arrow.bottom, .csd popover.touch-selection > arrow.bottom,
 menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
@@ -2558,13 +2542,11 @@ menu > arrow.bottom,
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
-.context-menu > arrow:hover, popover.touch-selection > arrow:hover, .csd popover.touch-selection > arrow:hover,
 menu > arrow:hover,
 .menu > arrow:hover {
   background-color: #e9e9e9;
 }
 
-.context-menu > arrow:disabled, popover.touch-selection > arrow:disabled, .csd popover.touch-selection > arrow:disabled,
 menu > arrow:disabled,
 .menu > arrow:disabled {
   color: transparent;
@@ -6521,7 +6503,7 @@ window.background:not(.csd) > widget > button > button label {
 }
 
 window.background:not(.csd) > menu,
-window.background:not(.csd) .menu, window.background:not(.csd) menu {
+window.background:not(.csd) .menu {
   background-color: #ffffff;
   border-radius: 0;
   border: none;
@@ -6531,8 +6513,7 @@ window.background:not(.csd) > menu .separator:not(label),
 .csd window.background:not(.csd) > menu .separator:not(label),
 window.background:not(.csd) .menu .separator:not(label),
 .csd
-window.background:not(.csd) .menu .separator:not(label), window.background:not(.csd) menu .separator:not(label),
-.csd window.background:not(.csd) menu .separator:not(label) {
+window.background:not(.csd) .menu .separator:not(label) {
   color: rgba(0, 0, 0, 0.11);
 }
 
@@ -8150,6 +8131,11 @@ 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.css b/src/gtk-3.0/gtk-dark-solid.css
index 393d8b0..fa22dbc 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -2413,8 +2413,6 @@ menubar > menuitem:disabled,
   border-color: transparent;
 }
 
-.context-menu, popover.touch-selection, .csd popover.touch-selection,
-popover.background.touch-selection, .csd popover.background.touch-selection,
 menu,
 .menu {
   padding: 6px 0;
@@ -2423,19 +2421,15 @@ menu,
   border: 1px solid #4B4B4B;
 }
 
-.csd .context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
-menu, .csd
+.csd menu, .csd
 .menu {
+  border-radius: 6px;
   background-color: #333333;
+  border: 1px solid #4B4B4B;
 }
 
-.context-menu separator, popover.touch-selection separator, .csd popover.touch-selection separator, popover.background.touch-selection separator, .csd popover.background.touch-selection separator,
-.csd .context-menu separator,
-.csd popover.touch-selection separator,
-.csd popover.background.touch-selection separator,
-menu separator,
-.csd
 menu separator,
+.csd menu separator,
 .menu separator,
 .csd
 .menu separator {
@@ -2445,7 +2439,6 @@ menu separator,
   background-color: transparent;
 }
 
-.context-menu menuitem, popover.touch-selection menuitem, .csd popover.touch-selection menuitem, popover.background.touch-selection menuitem, .csd popover.background.touch-selection menuitem,
 menu menuitem,
 .menu menuitem {
   min-height: 12px;
@@ -2455,7 +2448,6 @@ menu menuitem,
   border: 1px solid transparent;
 }
 
-.context-menu menuitem:hover, popover.touch-selection menuitem:hover, .csd popover.background.touch-selection menuitem:hover,
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
@@ -2463,7 +2455,6 @@ menu menuitem:hover,
   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);
 }
 
-.context-menu menuitem:hover arrow, popover.touch-selection menuitem:hover arrow, .csd popover.background.touch-selection menuitem:hover arrow,
 menu menuitem:hover arrow,
 .menu menuitem:hover arrow {
   transition: none;
@@ -2471,13 +2462,11 @@ menu menuitem:hover arrow,
   -gtk-icon-shadow: none;
 }
 
-.context-menu menuitem:disabled, popover.touch-selection menuitem:disabled, .csd popover.background.touch-selection menuitem:disabled,
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
 }
 
-.context-menu menuitem arrow, popover.touch-selection menuitem arrow, .csd popover.touch-selection menuitem arrow, popover.background.touch-selection menuitem arrow, .csd popover.background.touch-selection menuitem arrow,
 menu menuitem arrow,
 .menu menuitem arrow {
   min-height: 16px;
@@ -2488,14 +2477,12 @@ menu menuitem arrow,
   color: #dedede;
 }
 
-.context-menu menuitem arrow:dir(ltr), popover.touch-selection menuitem arrow:dir(ltr), .csd popover.touch-selection menuitem arrow:dir(ltr), popover.background.touch-selection menuitem arrow:dir(ltr), .csd popover.background.touch-selection menuitem arrow:dir(ltr),
 menu menuitem arrow:dir(ltr),
 .menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-right: 0;
 }
 
-.context-menu menuitem arrow:dir(rtl), popover.touch-selection menuitem arrow:dir(rtl), .csd popover.touch-selection menuitem arrow:dir(rtl), popover.background.touch-selection menuitem arrow:dir(rtl), .csd popover.background.touch-selection menuitem arrow:dir(rtl),
 menu menuitem arrow:dir(rtl),
 .menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
@@ -2521,7 +2508,6 @@ menuitem check:dir(rtl), menuitem radio:dir(rtl) {
   margin-right: 2px;
 }
 
-.context-menu > arrow, popover.touch-selection > arrow, .csd popover.touch-selection > arrow, popover.background.touch-selection > arrow, .csd popover.background.touch-selection > arrow,
 menu > arrow,
 .menu > arrow {
   min-width: 16px;
@@ -2534,7 +2520,6 @@ menu > arrow,
   color: #dedede;
 }
 
-.context-menu > arrow.top, popover.touch-selection > arrow.top, .csd popover.touch-selection > arrow.top,
 menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
@@ -2543,7 +2528,6 @@ menu > arrow.top,
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
-.context-menu > arrow.bottom, popover.touch-selection > arrow.bottom, .csd popover.touch-selection > arrow.bottom,
 menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
@@ -2552,13 +2536,11 @@ menu > arrow.bottom,
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
-.context-menu > arrow:hover, popover.touch-selection > arrow:hover, .csd popover.touch-selection > arrow:hover,
 menu > arrow:hover,
 .menu > arrow:hover {
   background-color: #373737;
 }
 
-.context-menu > arrow:disabled, popover.touch-selection > arrow:disabled, .csd popover.touch-selection > arrow:disabled,
 menu > arrow:disabled,
 .menu > arrow:disabled {
   color: transparent;
@@ -6516,7 +6498,7 @@ window.background:not(.csd) > widget > button > button label {
 }
 
 window.background:not(.csd) > menu,
-window.background:not(.csd) .menu, window.background:not(.csd) menu {
+window.background:not(.csd) .menu {
   background-color: #404040;
   border-radius: 0;
   border: none;
@@ -6526,8 +6508,7 @@ window.background:not(.csd) > menu .separator:not(label),
 .csd window.background:not(.csd) > menu .separator:not(label),
 window.background:not(.csd) .menu .separator:not(label),
 .csd
-window.background:not(.csd) .menu .separator:not(label), window.background:not(.csd) menu .separator:not(label),
-.csd window.background:not(.csd) menu .separator:not(label) {
+window.background:not(.csd) .menu .separator:not(label) {
   color: rgba(255, 255, 255, 0.12);
 }
 
@@ -8134,6 +8115,11 @@ 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.css b/src/gtk-3.0/gtk-dark.css
index 4784963..71f8dd5 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -2413,8 +2413,6 @@ menubar > menuitem:disabled,
   border-color: transparent;
 }
 
-.context-menu, popover.touch-selection, .csd popover.touch-selection,
-popover.background.touch-selection, .csd popover.background.touch-selection,
 menu,
 .menu {
   padding: 6px 0;
@@ -2423,19 +2421,15 @@ menu,
   border: 1px solid #4B4B4B;
 }
 
-.csd .context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
-menu, .csd
+.csd menu, .csd
 .menu {
+  border-radius: 6px;
   background-color: rgba(51, 51, 51, 0.98);
+  border: 1px solid #4B4B4B;
 }
 
-.context-menu separator, popover.touch-selection separator, .csd popover.touch-selection separator, popover.background.touch-selection separator, .csd popover.background.touch-selection separator,
-.csd .context-menu separator,
-.csd popover.touch-selection separator,
-.csd popover.background.touch-selection separator,
-menu separator,
-.csd
 menu separator,
+.csd menu separator,
 .menu separator,
 .csd
 .menu separator {
@@ -2445,7 +2439,6 @@ menu separator,
   background-color: transparent;
 }
 
-.context-menu menuitem, popover.touch-selection menuitem, .csd popover.touch-selection menuitem, popover.background.touch-selection menuitem, .csd popover.background.touch-selection menuitem,
 menu menuitem,
 .menu menuitem {
   min-height: 12px;
@@ -2455,7 +2448,6 @@ menu menuitem,
   border: 1px solid transparent;
 }
 
-.context-menu menuitem:hover, popover.touch-selection menuitem:hover, .csd popover.background.touch-selection menuitem:hover,
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
@@ -2463,7 +2455,6 @@ menu menuitem:hover,
   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);
 }
 
-.context-menu menuitem:hover arrow, popover.touch-selection menuitem:hover arrow, .csd popover.background.touch-selection menuitem:hover arrow,
 menu menuitem:hover arrow,
 .menu menuitem:hover arrow {
   transition: none;
@@ -2471,13 +2462,11 @@ menu menuitem:hover arrow,
   -gtk-icon-shadow: none;
 }
 
-.context-menu menuitem:disabled, popover.touch-selection menuitem:disabled, .csd popover.background.touch-selection menuitem:disabled,
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
 }
 
-.context-menu menuitem arrow, popover.touch-selection menuitem arrow, .csd popover.touch-selection menuitem arrow, popover.background.touch-selection menuitem arrow, .csd popover.background.touch-selection menuitem arrow,
 menu menuitem arrow,
 .menu menuitem arrow {
   min-height: 16px;
@@ -2488,14 +2477,12 @@ menu menuitem arrow,
   color: #dedede;
 }
 
-.context-menu menuitem arrow:dir(ltr), popover.touch-selection menuitem arrow:dir(ltr), .csd popover.touch-selection menuitem arrow:dir(ltr), popover.background.touch-selection menuitem arrow:dir(ltr), .csd popover.background.touch-selection menuitem arrow:dir(ltr),
 menu menuitem arrow:dir(ltr),
 .menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-right: 0;
 }
 
-.context-menu menuitem arrow:dir(rtl), popover.touch-selection menuitem arrow:dir(rtl), .csd popover.touch-selection menuitem arrow:dir(rtl), popover.background.touch-selection menuitem arrow:dir(rtl), .csd popover.background.touch-selection menuitem arrow:dir(rtl),
 menu menuitem arrow:dir(rtl),
 .menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
@@ -2521,7 +2508,6 @@ menuitem check:dir(rtl), menuitem radio:dir(rtl) {
   margin-right: 2px;
 }
 
-.context-menu > arrow, popover.touch-selection > arrow, .csd popover.touch-selection > arrow, popover.background.touch-selection > arrow, .csd popover.background.touch-selection > arrow,
 menu > arrow,
 .menu > arrow {
   min-width: 16px;
@@ -2534,7 +2520,6 @@ menu > arrow,
   color: #dedede;
 }
 
-.context-menu > arrow.top, popover.touch-selection > arrow.top, .csd popover.touch-selection > arrow.top,
 menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
@@ -2543,7 +2528,6 @@ menu > arrow.top,
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
-.context-menu > arrow.bottom, popover.touch-selection > arrow.bottom, .csd popover.touch-selection > arrow.bottom,
 menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
@@ -2552,13 +2536,11 @@ menu > arrow.bottom,
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
-.context-menu > arrow:hover, popover.touch-selection > arrow:hover, .csd popover.touch-selection > arrow:hover,
 menu > arrow:hover,
 .menu > arrow:hover {
   background-color: #373737;
 }
 
-.context-menu > arrow:disabled, popover.touch-selection > arrow:disabled, .csd popover.touch-selection > arrow:disabled,
 menu > arrow:disabled,
 .menu > arrow:disabled {
   color: transparent;
@@ -6516,7 +6498,7 @@ window.background:not(.csd) > widget > button > button label {
 }
 
 window.background:not(.csd) > menu,
-window.background:not(.csd) .menu, window.background:not(.csd) menu {
+window.background:not(.csd) .menu {
   background-color: #404040;
   border-radius: 0;
   border: none;
@@ -6526,8 +6508,7 @@ window.background:not(.csd) > menu .separator:not(label),
 .csd window.background:not(.csd) > menu .separator:not(label),
 window.background:not(.csd) .menu .separator:not(label),
 .csd
-window.background:not(.csd) .menu .separator:not(label), window.background:not(.csd) menu .separator:not(label),
-.csd window.background:not(.csd) menu .separator:not(label) {
+window.background:not(.csd) .menu .separator:not(label) {
   color: rgba(255, 255, 255, 0.12);
 }
 
@@ -8134,6 +8115,11 @@ 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.css b/src/gtk-3.0/gtk-light-solid.css
index 4175203..5ad6b38 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -2435,8 +2435,6 @@ menubar > menuitem:disabled,
   border-color: transparent;
 }
 
-.context-menu, popover.touch-selection, .csd popover.touch-selection,
-popover.background.touch-selection, .csd popover.background.touch-selection,
 menu,
 .menu {
   padding: 6px 0;
@@ -2445,19 +2443,15 @@ menu,
   border: 1px solid #E1E1E1;
 }
 
-.csd .context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
-menu, .csd
+.csd menu, .csd
 .menu {
+  border-radius: 6px;
   background-color: #ffffff;
+  border: 1px solid #E1E1E1;
 }
 
-.context-menu separator, popover.touch-selection separator, .csd popover.touch-selection separator, popover.background.touch-selection separator, .csd popover.background.touch-selection separator,
-.csd .context-menu separator,
-.csd popover.touch-selection separator,
-.csd popover.background.touch-selection separator,
-menu separator,
-.csd
 menu separator,
+.csd menu separator,
 .menu separator,
 .csd
 .menu separator {
@@ -2467,7 +2461,6 @@ menu separator,
   background-color: transparent;
 }
 
-.context-menu menuitem, popover.touch-selection menuitem, .csd popover.touch-selection menuitem, popover.background.touch-selection menuitem, .csd popover.background.touch-selection menuitem,
 menu menuitem,
 .menu menuitem {
   min-height: 12px;
@@ -2477,7 +2470,6 @@ menu menuitem,
   border: 1px solid transparent;
 }
 
-.context-menu menuitem:hover, popover.touch-selection menuitem:hover, .csd popover.background.touch-selection menuitem:hover,
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
@@ -2485,7 +2477,6 @@ menu menuitem:hover,
   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);
 }
 
-.context-menu menuitem:hover arrow, popover.touch-selection menuitem:hover arrow, .csd popover.background.touch-selection menuitem:hover arrow,
 menu menuitem:hover arrow,
 .menu menuitem:hover arrow {
   transition: none;
@@ -2493,13 +2484,11 @@ menu menuitem:hover arrow,
   -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);
 }
 
-.context-menu menuitem:disabled, popover.touch-selection menuitem:disabled, .csd popover.background.touch-selection menuitem:disabled,
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
 }
 
-.context-menu menuitem arrow, popover.touch-selection menuitem arrow, .csd popover.touch-selection menuitem arrow, popover.background.touch-selection menuitem arrow, .csd popover.background.touch-selection menuitem arrow,
 menu menuitem arrow,
 .menu menuitem arrow {
   min-height: 16px;
@@ -2510,14 +2499,12 @@ menu menuitem arrow,
   color: #242424;
 }
 
-.context-menu menuitem arrow:dir(ltr), popover.touch-selection menuitem arrow:dir(ltr), .csd popover.touch-selection menuitem arrow:dir(ltr), popover.background.touch-selection menuitem arrow:dir(ltr), .csd popover.background.touch-selection menuitem arrow:dir(ltr),
 menu menuitem arrow:dir(ltr),
 .menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-right: 0;
 }
 
-.context-menu menuitem arrow:dir(rtl), popover.touch-selection menuitem arrow:dir(rtl), .csd popover.touch-selection menuitem arrow:dir(rtl), popover.background.touch-selection menuitem arrow:dir(rtl), .csd popover.background.touch-selection menuitem arrow:dir(rtl),
 menu menuitem arrow:dir(rtl),
 .menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
@@ -2543,7 +2530,6 @@ menuitem check:dir(rtl), menuitem radio:dir(rtl) {
   margin-right: 2px;
 }
 
-.context-menu > arrow, popover.touch-selection > arrow, .csd popover.touch-selection > arrow, popover.background.touch-selection > arrow, .csd popover.background.touch-selection > arrow,
 menu > arrow,
 .menu > arrow {
   min-width: 16px;
@@ -2556,7 +2542,6 @@ menu > arrow,
   color: #242424;
 }
 
-.context-menu > arrow.top, popover.touch-selection > arrow.top, .csd popover.touch-selection > arrow.top,
 menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
@@ -2565,7 +2550,6 @@ menu > arrow.top,
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
-.context-menu > arrow.bottom, popover.touch-selection > arrow.bottom, .csd popover.touch-selection > arrow.bottom,
 menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
@@ -2574,13 +2558,11 @@ menu > arrow.bottom,
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
-.context-menu > arrow:hover, popover.touch-selection > arrow:hover, .csd popover.touch-selection > arrow:hover,
 menu > arrow:hover,
 .menu > arrow:hover {
   background-color: #e9e9e9;
 }
 
-.context-menu > arrow:disabled, popover.touch-selection > arrow:disabled, .csd popover.touch-selection > arrow:disabled,
 menu > arrow:disabled,
 .menu > arrow:disabled {
   color: transparent;
@@ -6533,7 +6515,7 @@ window.background:not(.csd) > widget > button > button label {
 }
 
 window.background:not(.csd) > menu,
-window.background:not(.csd) .menu, window.background:not(.csd) menu {
+window.background:not(.csd) .menu {
   background-color: #ffffff;
   border-radius: 0;
   border: none;
@@ -6543,8 +6525,7 @@ window.background:not(.csd) > menu .separator:not(label),
 .csd window.background:not(.csd) > menu .separator:not(label),
 window.background:not(.csd) .menu .separator:not(label),
 .csd
-window.background:not(.csd) .menu .separator:not(label), window.background:not(.csd) menu .separator:not(label),
-.csd window.background:not(.csd) menu .separator:not(label) {
+window.background:not(.csd) .menu .separator:not(label) {
   color: rgba(0, 0, 0, 0.11);
 }
 
@@ -8162,6 +8143,11 @@ 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.css b/src/gtk-3.0/gtk-light.css
index 6bf35c0..66d0057 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -2435,8 +2435,6 @@ menubar > menuitem:disabled,
   border-color: transparent;
 }
 
-.context-menu, popover.touch-selection, .csd popover.touch-selection,
-popover.background.touch-selection, .csd popover.background.touch-selection,
 menu,
 .menu {
   padding: 6px 0;
@@ -2445,19 +2443,15 @@ menu,
   border: 1px solid #E1E1E1;
 }
 
-.csd .context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
-menu, .csd
+.csd menu, .csd
 .menu {
+  border-radius: 6px;
   background-color: rgba(255, 255, 255, 0.95);
+  border: 1px solid #E1E1E1;
 }
 
-.context-menu separator, popover.touch-selection separator, .csd popover.touch-selection separator, popover.background.touch-selection separator, .csd popover.background.touch-selection separator,
-.csd .context-menu separator,
-.csd popover.touch-selection separator,
-.csd popover.background.touch-selection separator,
-menu separator,
-.csd
 menu separator,
+.csd menu separator,
 .menu separator,
 .csd
 .menu separator {
@@ -2467,7 +2461,6 @@ menu separator,
   background-color: transparent;
 }
 
-.context-menu menuitem, popover.touch-selection menuitem, .csd popover.touch-selection menuitem, popover.background.touch-selection menuitem, .csd popover.background.touch-selection menuitem,
 menu menuitem,
 .menu menuitem {
   min-height: 12px;
@@ -2477,7 +2470,6 @@ menu menuitem,
   border: 1px solid transparent;
 }
 
-.context-menu menuitem:hover, popover.touch-selection menuitem:hover, .csd popover.background.touch-selection menuitem:hover,
 menu menuitem:hover,
 .menu menuitem:hover {
   color: #ffffff;
@@ -2485,7 +2477,6 @@ menu menuitem:hover,
   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);
 }
 
-.context-menu menuitem:hover arrow, popover.touch-selection menuitem:hover arrow, .csd popover.background.touch-selection menuitem:hover arrow,
 menu menuitem:hover arrow,
 .menu menuitem:hover arrow {
   transition: none;
@@ -2493,13 +2484,11 @@ menu menuitem:hover arrow,
   -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);
 }
 
-.context-menu menuitem:disabled, popover.touch-selection menuitem:disabled, .csd popover.background.touch-selection menuitem:disabled,
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
 }
 
-.context-menu menuitem arrow, popover.touch-selection menuitem arrow, .csd popover.touch-selection menuitem arrow, popover.background.touch-selection menuitem arrow, .csd popover.background.touch-selection menuitem arrow,
 menu menuitem arrow,
 .menu menuitem arrow {
   min-height: 16px;
@@ -2510,14 +2499,12 @@ menu menuitem arrow,
   color: #242424;
 }
 
-.context-menu menuitem arrow:dir(ltr), popover.touch-selection menuitem arrow:dir(ltr), .csd popover.touch-selection menuitem arrow:dir(ltr), popover.background.touch-selection menuitem arrow:dir(ltr), .csd popover.background.touch-selection menuitem arrow:dir(ltr),
 menu menuitem arrow:dir(ltr),
 .menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-right: 0;
 }
 
-.context-menu menuitem arrow:dir(rtl), popover.touch-selection menuitem arrow:dir(rtl), .csd popover.touch-selection menuitem arrow:dir(rtl), popover.background.touch-selection menuitem arrow:dir(rtl), .csd popover.background.touch-selection menuitem arrow:dir(rtl),
 menu menuitem arrow:dir(rtl),
 .menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
@@ -2543,7 +2530,6 @@ menuitem check:dir(rtl), menuitem radio:dir(rtl) {
   margin-right: 2px;
 }
 
-.context-menu > arrow, popover.touch-selection > arrow, .csd popover.touch-selection > arrow, popover.background.touch-selection > arrow, .csd popover.background.touch-selection > arrow,
 menu > arrow,
 .menu > arrow {
   min-width: 16px;
@@ -2556,7 +2542,6 @@ menu > arrow,
   color: #242424;
 }
 
-.context-menu > arrow.top, popover.touch-selection > arrow.top, .csd popover.touch-selection > arrow.top,
 menu > arrow.top,
 .menu > arrow.top {
   margin: -8px 0 0 0;
@@ -2565,7 +2550,6 @@ menu > arrow.top,
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
-.context-menu > arrow.bottom, popover.touch-selection > arrow.bottom, .csd popover.touch-selection > arrow.bottom,
 menu > arrow.bottom,
 .menu > arrow.bottom {
   margin: 0 0 -18px 0;
@@ -2574,13 +2558,11 @@ menu > arrow.bottom,
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
-.context-menu > arrow:hover, popover.touch-selection > arrow:hover, .csd popover.touch-selection > arrow:hover,
 menu > arrow:hover,
 .menu > arrow:hover {
   background-color: #e9e9e9;
 }
 
-.context-menu > arrow:disabled, popover.touch-selection > arrow:disabled, .csd popover.touch-selection > arrow:disabled,
 menu > arrow:disabled,
 .menu > arrow:disabled {
   color: transparent;
@@ -6533,7 +6515,7 @@ window.background:not(.csd) > widget > button > button label {
 }
 
 window.background:not(.csd) > menu,
-window.background:not(.csd) .menu, window.background:not(.csd) menu {
+window.background:not(.csd) .menu {
   background-color: #ffffff;
   border-radius: 0;
   border: none;
@@ -6543,8 +6525,7 @@ window.background:not(.csd) > menu .separator:not(label),
 .csd window.background:not(.csd) > menu .separator:not(label),
 window.background:not(.csd) .menu .separator:not(label),
 .csd
-window.background:not(.csd) .menu .separator:not(label), window.background:not(.csd) menu .separator:not(label),
-.csd window.background:not(.csd) menu .separator:not(label) {
+window.background:not(.csd) .menu .separator:not(label) {
   color: rgba(0, 0, 0, 0.11);
 }
 
@@ -8162,6 +8143,11 @@ 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/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index 3eca0d1..d5d6162 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -1502,7 +1502,7 @@ window.background:not(.csd) {
   }
 
   > menu,
-  .menu, menu { // context-menus
+  .menu { // context-menus
     background-color: if($variant == 'light', $base_color, lighten($bg_color, 5%));
     border-radius: 0;
     border: none;
diff --git a/src/gtk-3.0/sass/_budgie.scss b/src/gtk-3.0/sass/_budgie.scss
index c987b7d..432f4b8 100644
--- a/src/gtk-3.0/sass/_budgie.scss
+++ b/src/gtk-3.0/sass/_budgie.scss
@@ -368,9 +368,11 @@ popover.background.places-menu {
     > menuitem {
       border: none;
       background-image: none;
+
       menu {
         border-radius: 0 0 $wm_radius $wm_radius;
       }
+
       &:hover {
         background-color: $selected_bg_color;
       }
@@ -419,6 +421,13 @@ 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;
+  }
+}
+
 %underscores {
   @each $pos, $b_pos, $b_wid in (top,    center calc(1px),        2 0 0 0 / 2px 0 0 0),
                                 (bottom, center calc(100% - 1px), 0 0 2 0 / 0 0 2px 0),
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index a2ff9e9..a5fc23c 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -1890,7 +1890,7 @@ menubar,
   }
 }
 
-.context-menu,
+//.context-menu,
 menu,
 .menu {
 //  margin: 4px;
@@ -1900,7 +1900,9 @@ menu,
   border: 1px solid $bar_border;
 
   .csd & {
+    border-radius: $wm_radius;
     background-color: $_menu_bg;
+    border: 1px solid $bar_border;
   }
 
   separator,