diff --git a/css/userChrome-files/context_menus.css b/css/userChrome-files/context_menus.css
index fc01e1a..546910a 100644
--- a/css/userChrome-files/context_menus.css
+++ b/css/userChrome-files/context_menus.css
@@ -17,7 +17,7 @@ popup > menu > menupopup {
   background: var(--in-content-box-background)!important
 }
 #context-navigation menuitem:hover {
-  background: var(--in-content-category-header-background)!important
+  background: var(--in-content-primary-button-background-hover)!important
 }
 menuitem,
 menupopup menu {
@@ -25,9 +25,11 @@ menupopup menu {
   color: var(--in-content-selected-text)!important
 }
 menupopup menuseparator {
-  padding: 0!important;
-  border-top: none!important;
-  margin: 2px 6px!important
+  -moz-appearance: none!important;
+  padding: 1px!important;
+  margin: 5px 0!important;
+  background: var(--in-content-table-border-dark-color)!important;
+  border-top: none!important
 }
 #context-navigation menuitem[disabled=true],
 menu[disabled=true],
@@ -46,7 +48,7 @@ menuitem:hover[disabled=true] {
 menuitem[_moz-menuactive=true],
 menupopup menu[_moz-menuactive=true] {
   color: var(--in-content-selected-text)!important;
-  background-color: var(--in-content-category-header-background)!important
+  background-color: var(--in-content-primary-button-background-hover)!important
 }
 vbox#sidebar-box.chromeclass-extrachrome {
   border-color: var(--in-content-category-header-background)!important;
@@ -64,9 +66,8 @@ screen and (-moz-os-version:windows-win7),
 screen and (-moz-os-version:windows-win8),
 screen and (-moz-os-version:windows-win10) {
   menupopup menuseparator {
-    -moz-appearance: none!important;
-    background: rgba(0,0,0,0)!important;
-    border: 0!important
+    padding: 0!important;
+    border-color: var(--in-content-table-border-dark-color)!important
   }
   #context-navigation,
   #context-sep-navigation {
diff --git a/userChrome.css b/userChrome.css
index fd28bdf..92af8d0 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -361,7 +361,7 @@ popup > menu > menupopup {
   background: var(--in-content-box-background)!important
 }
 #context-navigation menuitem:hover {
-  background: var(--in-content-category-header-background)!important
+  background: var(--in-content-primary-button-background-hover)!important
 }
 menuitem,
 menupopup menu {
@@ -369,9 +369,11 @@ menupopup menu {
   color: var(--in-content-selected-text)!important
 }
 menupopup menuseparator {
-  padding: 0!important;
-  border-top: none!important;
-  margin: 2px 6px!important
+  -moz-appearance: none!important;
+  padding: 1px!important;
+  margin: 5px 0!important;
+  background: var(--in-content-table-border-dark-color)!important;
+  border-top: none!important
 }
 #context-navigation menuitem[disabled=true],
 menu[disabled=true],
@@ -390,7 +392,7 @@ menuitem:hover[disabled=true] {
 menuitem[_moz-menuactive=true],
 menupopup menu[_moz-menuactive=true] {
   color: var(--in-content-selected-text)!important;
-  background-color: var(--in-content-category-header-background)!important
+  background-color: var(--in-content-primary-button-background-hover)!important
 }
 vbox#sidebar-box.chromeclass-extrachrome {
   border-color: var(--in-content-category-header-background)!important;
@@ -408,9 +410,8 @@ screen and (-moz-os-version:windows-win7),
 screen and (-moz-os-version:windows-win8),
 screen and (-moz-os-version:windows-win10) {
   menupopup menuseparator {
-    -moz-appearance: none!important;
-    background: rgba(0,0,0,0)!important;
-    border: 0!important
+    padding: 0!important;
+    border-color: var(--in-content-table-border-dark-color)!important
   }
   #context-navigation,
   #context-sep-navigation {