diff --git a/share/themes/Kali-Dark/gtk-2.0/assets/menubar_button.png b/share/themes/Kali-Dark/gtk-2.0/assets/menubar_button.png
index cd9ca6d9..999ff63e 100644
Binary files a/share/themes/Kali-Dark/gtk-2.0/assets/menubar_button.png and b/share/themes/Kali-Dark/gtk-2.0/assets/menubar_button.png differ
diff --git a/share/themes/Kali-Dark/gtk-2.0/gtkrc b/share/themes/Kali-Dark/gtk-2.0/gtkrc
index 80924931..cf30450e 100644
--- a/share/themes/Kali-Dark/gtk-2.0/gtkrc
+++ b/share/themes/Kali-Dark/gtk-2.0/gtkrc
@@ -14,7 +14,7 @@ gtk-color-scheme = "link_color: #2777ff"
 gtk-color-scheme = "menu_bg: #272a34"
 
 gtk-icon-sizes = "gtk-button=15,15" # This makes button icons smaller.
-gtk-auto-mnemonics = 1
+gtk-enable-mnemonics = 0
 gtk-primary-button-warps-slider = 1
 
 include "main.rc"
diff --git a/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
index baf7f447..9a18ae34 100644
--- a/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -1,11 +1,11 @@
 style "menubar" {
 
   bg[NORMAL] = "#2f343f"
-  fg[NORMAL] = "#afb8c5"
-  fg[PRELIGHT] = "#afb8c5"
-  fg[ACTIVE] = "#afb8c5"
+  fg[NORMAL] = "#eeeeec"
+  fg[PRELIGHT] = "#eeeeec"
+  fg[ACTIVE] = "#eeeeec"
   fg[SELECTED] = @selected_fg_color
-  fg[INSENSITIVE] = shade(0.7, "#afb8c5")
+  fg[INSENSITIVE] = shade(0.7, "#eeeeec")
 
   xthickness = 0
   ythickness = 0
@@ -24,9 +24,9 @@ style "menubar" {
 style "menubar-borderless" {
 
   bg[NORMAL] = "#2f343f"
-  fg[NORMAL] = "#afb8c5"
+  fg[NORMAL] = "#eeeeec"
   fg[SELECTED] = @selected_fg_color
-  fg[INSENSITIVE] = shade(0.7, "#afb8c5")
+  fg[INSENSITIVE] = shade(0.7, "#eeeeec")
 
   xthickness = 0
   ythickness = 0
@@ -45,7 +45,7 @@ style "menubar-borderless" {
 style "menubar_item" {
 
   xthickness = 2
-  ythickness = 4
+  ythickness = 6
 
   fg[PRELIGHT] = @selected_fg_color
 
@@ -55,7 +55,7 @@ style "menubar_item" {
       function = BOX
       state = PRELIGHT
       file = "menubar-toolbar/menubar_button-dark.png"
-      border = { 2, 2, 2, 2 }
+      border = { 0, 0, 0, 5 }
       stretch = TRUE
     }
   }
@@ -72,15 +72,15 @@ style "menubar-text" {
 
 
 style "toolbar_text" {
-  fg[NORMAL] = "#afb8c5"
-  fg[PRELIGHT] = "#afb8c5"
-  fg[INSENSITIVE] = shade(0.7, "#afb8c5")
-  fg[ACTIVE] = "#afb8c5"
+  fg[NORMAL] = "#eeeeec"
+  fg[PRELIGHT] = "#eeeeec"
+  fg[INSENSITIVE] = shade(0.7, "#eeeeec")
+  fg[ACTIVE] = "#eeeeec"
 
-  text[NORMAL] = "#afb8c5"
-  text[PRELIGHT] = "#afb8c5"
-  text[INSENSITIVE] = shade(0.7, "#afb8c5")
-  text[ACTIVE] = "#afb8c5"
+  text[NORMAL] = "#eeeeec"
+  text[PRELIGHT] = "#eeeeec"
+  text[INSENSITIVE] = shade(0.7, "#eeeeec")
+  text[ACTIVE] = "#eeeeec"
 
 }
 
@@ -131,7 +131,7 @@ style "toolbar_entry" {
   base[ACTIVE] = "#404552"
   base[INSENSITIVE] = "#39404d"
 
-  text[NORMAL] = "#afb8c5"
+  text[NORMAL] = "#eeeeec"
 
   engine "pixmap" {
 
diff --git a/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index 4cb89eb3..e8c8d00f 100644
--- a/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -45,9 +45,9 @@ style "menubar-borderless" {
 style "menubar_item" {
 
   xthickness = 2
-  ythickness = 4
+  ythickness = 6
 
-  fg[PRELIGHT] = @selected_fg_color
+  fg[PRELIGHT] = "#70788d"
 
   engine "pixmap" {
 
@@ -55,7 +55,7 @@ style "menubar_item" {
       function = BOX
       state = PRELIGHT
       file = "menubar-toolbar/menubar_button.png"
-      border = { 2, 2, 2, 2 }
+      border = { 0, 0, 0, 5 }
       stretch = TRUE
     }
   }
diff --git a/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar_button-dark.png b/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar_button-dark.png
index cd9ca6d9..999ff63e 100644
Binary files a/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar_button-dark.png and b/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar_button-dark.png differ
diff --git a/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar_button.png b/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar_button.png
index cd9ca6d9..999ff63e 100644
Binary files a/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar_button.png and b/share/themes/Kali-Dark/gtk-2.0/menubar-toolbar/menubar_button.png differ
diff --git a/share/themes/Kali-Light/gtk-2.0/assets/menubar_button.png b/share/themes/Kali-Light/gtk-2.0/assets/menubar_button.png
index cd9ca6d9..999ff63e 100644
Binary files a/share/themes/Kali-Light/gtk-2.0/assets/menubar_button.png and b/share/themes/Kali-Light/gtk-2.0/assets/menubar_button.png differ
diff --git a/share/themes/Kali-Light/gtk-2.0/gtkrc b/share/themes/Kali-Light/gtk-2.0/gtkrc
index 44d23b53..9e5036f9 100644
--- a/share/themes/Kali-Light/gtk-2.0/gtkrc
+++ b/share/themes/Kali-Light/gtk-2.0/gtkrc
@@ -14,7 +14,7 @@ gtk-color-scheme = "link_color: #2777ff"
 gtk-color-scheme = "menu_bg: #fafafa"
 
 gtk-icon-sizes = "gtk-button=15,15" # This makes button icons smaller.
-gtk-auto-mnemonics = 1
+gtk-enable-mnemonics = 0
 gtk-primary-button-warps-slider = 1
 
 include "main.rc"
diff --git a/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
index baf7f447..9a18ae34 100644
--- a/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -1,11 +1,11 @@
 style "menubar" {
 
   bg[NORMAL] = "#2f343f"
-  fg[NORMAL] = "#afb8c5"
-  fg[PRELIGHT] = "#afb8c5"
-  fg[ACTIVE] = "#afb8c5"
+  fg[NORMAL] = "#eeeeec"
+  fg[PRELIGHT] = "#eeeeec"
+  fg[ACTIVE] = "#eeeeec"
   fg[SELECTED] = @selected_fg_color
-  fg[INSENSITIVE] = shade(0.7, "#afb8c5")
+  fg[INSENSITIVE] = shade(0.7, "#eeeeec")
 
   xthickness = 0
   ythickness = 0
@@ -24,9 +24,9 @@ style "menubar" {
 style "menubar-borderless" {
 
   bg[NORMAL] = "#2f343f"
-  fg[NORMAL] = "#afb8c5"
+  fg[NORMAL] = "#eeeeec"
   fg[SELECTED] = @selected_fg_color
-  fg[INSENSITIVE] = shade(0.7, "#afb8c5")
+  fg[INSENSITIVE] = shade(0.7, "#eeeeec")
 
   xthickness = 0
   ythickness = 0
@@ -45,7 +45,7 @@ style "menubar-borderless" {
 style "menubar_item" {
 
   xthickness = 2
-  ythickness = 4
+  ythickness = 6
 
   fg[PRELIGHT] = @selected_fg_color
 
@@ -55,7 +55,7 @@ style "menubar_item" {
       function = BOX
       state = PRELIGHT
       file = "menubar-toolbar/menubar_button-dark.png"
-      border = { 2, 2, 2, 2 }
+      border = { 0, 0, 0, 5 }
       stretch = TRUE
     }
   }
@@ -72,15 +72,15 @@ style "menubar-text" {
 
 
 style "toolbar_text" {
-  fg[NORMAL] = "#afb8c5"
-  fg[PRELIGHT] = "#afb8c5"
-  fg[INSENSITIVE] = shade(0.7, "#afb8c5")
-  fg[ACTIVE] = "#afb8c5"
+  fg[NORMAL] = "#eeeeec"
+  fg[PRELIGHT] = "#eeeeec"
+  fg[INSENSITIVE] = shade(0.7, "#eeeeec")
+  fg[ACTIVE] = "#eeeeec"
 
-  text[NORMAL] = "#afb8c5"
-  text[PRELIGHT] = "#afb8c5"
-  text[INSENSITIVE] = shade(0.7, "#afb8c5")
-  text[ACTIVE] = "#afb8c5"
+  text[NORMAL] = "#eeeeec"
+  text[PRELIGHT] = "#eeeeec"
+  text[INSENSITIVE] = shade(0.7, "#eeeeec")
+  text[ACTIVE] = "#eeeeec"
 
 }
 
@@ -131,7 +131,7 @@ style "toolbar_entry" {
   base[ACTIVE] = "#404552"
   base[INSENSITIVE] = "#39404d"
 
-  text[NORMAL] = "#afb8c5"
+  text[NORMAL] = "#eeeeec"
 
   engine "pixmap" {
 
diff --git a/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index 4cb89eb3..e8c8d00f 100644
--- a/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -45,9 +45,9 @@ style "menubar-borderless" {
 style "menubar_item" {
 
   xthickness = 2
-  ythickness = 4
+  ythickness = 6
 
-  fg[PRELIGHT] = @selected_fg_color
+  fg[PRELIGHT] = "#70788d"
 
   engine "pixmap" {
 
@@ -55,7 +55,7 @@ style "menubar_item" {
       function = BOX
       state = PRELIGHT
       file = "menubar-toolbar/menubar_button.png"
-      border = { 2, 2, 2, 2 }
+      border = { 0, 0, 0, 5 }
       stretch = TRUE
     }
   }
diff --git a/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar_button-dark.png b/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar_button-dark.png
index cd9ca6d9..999ff63e 100644
Binary files a/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar_button-dark.png and b/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar_button-dark.png differ
diff --git a/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar_button.png b/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar_button.png
index cd9ca6d9..999ff63e 100644
Binary files a/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar_button.png and b/share/themes/Kali-Light/gtk-2.0/menubar-toolbar/menubar_button.png differ