diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index eaa9f6f8..9fdcd3c4 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -3333,6 +3333,23 @@ radio {
   menu menuitem check, menu menuitem
   radio {
     margin: 0; }
+    menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:disabled, menu menuitem check:indeterminate, menu menuitem check:indeterminate:hover, menu menuitem check:indeterminate:disabled, menu menuitem
+    radio, menu menuitem
+    radio:hover, menu menuitem
+    radio:disabled, menu menuitem
+    radio:checked, menu menuitem
+    radio:checked:hover, menu menuitem
+    radio:checked:disabled, menu menuitem
+    radio:indeterminate, menu menuitem
+    radio:indeterminate:hover, menu menuitem
+    radio:indeterminate:disabled {
+      min-height: 14px;
+      min-width: 14px;
+      background-image: none;
+      box-shadow: none;
+      -gtk-icon-shadow: none;
+      color: inherit;
+      border-color: currentColor; }
 
 
 check {
@@ -5096,41 +5113,44 @@ switch {
 /*************************
  * Check and Radio items *
  *************************/
-check,
+check, menu menuitem check, menu menuitem:hover check,
+radio, menu menuitem
+radio, menu menuitem:hover
 radio {
   background-image: linear-gradient(to bottom, #1e2128 20%, #1a1c23 90%);
+  border-color: black;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.27); }
-  check:checked:disabled,
-  radio:checked:disabled, check:indeterminate:disabled,
-  radio:indeterminate:disabled, check:backdrop:checked:disabled,
-  radio:backdrop:checked:disabled, check:backdrop:indeterminate:disabled,
-  radio:backdrop:indeterminate:disabled, check:disabled, check:disabled:backdrop,
-  radio:disabled,
-  radio:disabled:backdrop {
-    border-color: #0d0e11;
-    background-image: image(#23252e); }
-  check:checked,
-  radio:checked {
-    background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%);
-    border-color: #00348d;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27); }
-    check:checked:active,
-    radio:checked:active {
-      box-shadow: none; }
-    check:checked:backdrop,
-    radio:checked:backdrop {
-      background-image: image(#2777ff); }
-  check:indeterminate,
-  radio:indeterminate {
-    background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%);
-    border-color: #00348d;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27); }
-    check:indeterminate:active,
-    radio:indeterminate:active {
-      box-shadow: none; }
-    check:indeterminate:backdrop,
-    radio:indeterminate:backdrop {
-      background-image: image(#2777ff); }
+
+check:checked, check:indeterminate, menu menuitem check:checked, menu menuitem check:indeterminate,
+radio:checked,
+radio:indeterminate, menu menuitem
+radio:checked, menu menuitem
+radio:indeterminate {
+  background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%);
+  border-color: #00348d;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  check:checked:active, check:indeterminate:active, menu menuitem check:checked:active, menu menuitem check:indeterminate:active,
+  radio:checked:active,
+  radio:indeterminate:active, menu menuitem
+  radio:checked:active, menu menuitem
+  radio:indeterminate:active {
+    box-shadow: none; }
+  check:checked:backdrop, check:indeterminate:backdrop, menu menuitem check:checked:backdrop, menu menuitem check:indeterminate:backdrop,
+  radio:checked:backdrop,
+  radio:indeterminate:backdrop, menu menuitem
+  radio:checked:backdrop, menu menuitem
+  radio:indeterminate:backdrop {
+    background-image: image(#2777ff); }
+
+check:checked:disabled, check:indeterminate:disabled, menu menuitem check:checked:disabled, menu menuitem check:indeterminate:disabled,
+radio:checked:disabled,
+radio:indeterminate:disabled, menu menuitem radio:checked:disabled, menu menuitem radio:indeterminate:disabled, check:backdrop:checked:disabled, check:backdrop:indeterminate:disabled,
+radio:backdrop:checked:disabled,
+radio:backdrop:indeterminate:disabled, check:disabled, check:disabled:backdrop,
+radio:disabled,
+radio:disabled:backdrop {
+  border-color: #0d0e11;
+  background-image: image(#23252e); }
 
 /************
  * GtkScale *
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
index eaa9f6f8..9fdcd3c4 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -3333,6 +3333,23 @@ radio {
   menu menuitem check, menu menuitem
   radio {
     margin: 0; }
+    menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:disabled, menu menuitem check:indeterminate, menu menuitem check:indeterminate:hover, menu menuitem check:indeterminate:disabled, menu menuitem
+    radio, menu menuitem
+    radio:hover, menu menuitem
+    radio:disabled, menu menuitem
+    radio:checked, menu menuitem
+    radio:checked:hover, menu menuitem
+    radio:checked:disabled, menu menuitem
+    radio:indeterminate, menu menuitem
+    radio:indeterminate:hover, menu menuitem
+    radio:indeterminate:disabled {
+      min-height: 14px;
+      min-width: 14px;
+      background-image: none;
+      box-shadow: none;
+      -gtk-icon-shadow: none;
+      color: inherit;
+      border-color: currentColor; }
 
 
 check {
@@ -5096,41 +5113,44 @@ switch {
 /*************************
  * Check and Radio items *
  *************************/
-check,
+check, menu menuitem check, menu menuitem:hover check,
+radio, menu menuitem
+radio, menu menuitem:hover
 radio {
   background-image: linear-gradient(to bottom, #1e2128 20%, #1a1c23 90%);
+  border-color: black;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.27); }
-  check:checked:disabled,
-  radio:checked:disabled, check:indeterminate:disabled,
-  radio:indeterminate:disabled, check:backdrop:checked:disabled,
-  radio:backdrop:checked:disabled, check:backdrop:indeterminate:disabled,
-  radio:backdrop:indeterminate:disabled, check:disabled, check:disabled:backdrop,
-  radio:disabled,
-  radio:disabled:backdrop {
-    border-color: #0d0e11;
-    background-image: image(#23252e); }
-  check:checked,
-  radio:checked {
-    background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%);
-    border-color: #00348d;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27); }
-    check:checked:active,
-    radio:checked:active {
-      box-shadow: none; }
-    check:checked:backdrop,
-    radio:checked:backdrop {
-      background-image: image(#2777ff); }
-  check:indeterminate,
-  radio:indeterminate {
-    background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%);
-    border-color: #00348d;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27); }
-    check:indeterminate:active,
-    radio:indeterminate:active {
-      box-shadow: none; }
-    check:indeterminate:backdrop,
-    radio:indeterminate:backdrop {
-      background-image: image(#2777ff); }
+
+check:checked, check:indeterminate, menu menuitem check:checked, menu menuitem check:indeterminate,
+radio:checked,
+radio:indeterminate, menu menuitem
+radio:checked, menu menuitem
+radio:indeterminate {
+  background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%);
+  border-color: #00348d;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  check:checked:active, check:indeterminate:active, menu menuitem check:checked:active, menu menuitem check:indeterminate:active,
+  radio:checked:active,
+  radio:indeterminate:active, menu menuitem
+  radio:checked:active, menu menuitem
+  radio:indeterminate:active {
+    box-shadow: none; }
+  check:checked:backdrop, check:indeterminate:backdrop, menu menuitem check:checked:backdrop, menu menuitem check:indeterminate:backdrop,
+  radio:checked:backdrop,
+  radio:indeterminate:backdrop, menu menuitem
+  radio:checked:backdrop, menu menuitem
+  radio:indeterminate:backdrop {
+    background-image: image(#2777ff); }
+
+check:checked:disabled, check:indeterminate:disabled, menu menuitem check:checked:disabled, menu menuitem check:indeterminate:disabled,
+radio:checked:disabled,
+radio:indeterminate:disabled, menu menuitem radio:checked:disabled, menu menuitem radio:indeterminate:disabled, check:backdrop:checked:disabled, check:backdrop:indeterminate:disabled,
+radio:backdrop:checked:disabled,
+radio:backdrop:indeterminate:disabled, check:disabled, check:disabled:backdrop,
+radio:disabled,
+radio:disabled:backdrop {
+  border-color: #0d0e11;
+  background-image: image(#23252e); }
 
 /************
  * GtkScale *
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index ad0dda7c..cfd968f8 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -3356,6 +3356,23 @@ radio {
   menu menuitem check, menu menuitem
   radio {
     margin: 0; }
+    menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:disabled, menu menuitem check:indeterminate, menu menuitem check:indeterminate:hover, menu menuitem check:indeterminate:disabled, menu menuitem
+    radio, menu menuitem
+    radio:hover, menu menuitem
+    radio:disabled, menu menuitem
+    radio:checked, menu menuitem
+    radio:checked:hover, menu menuitem
+    radio:checked:disabled, menu menuitem
+    radio:indeterminate, menu menuitem
+    radio:indeterminate:hover, menu menuitem
+    radio:indeterminate:disabled {
+      min-height: 14px;
+      min-width: 14px;
+      background-image: none;
+      box-shadow: none;
+      -gtk-icon-shadow: none;
+      color: inherit;
+      border-color: currentColor; }
 
 
 check {
@@ -5120,41 +5137,44 @@ switch {
 /*************************
  * Check and Radio items *
  *************************/
-check,
+check, menu menuitem check, menu menuitem:hover check,
+radio, menu menuitem
+radio, menu menuitem:hover
 radio {
   background-image: linear-gradient(to bottom, white 20%, #fafafa 90%);
+  border-color: #c2c2c2;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07); }
-  check:checked:disabled,
-  radio:checked:disabled, check:indeterminate:disabled,
-  radio:indeterminate:disabled, check:backdrop:checked:disabled,
-  radio:backdrop:checked:disabled, check:backdrop:indeterminate:disabled,
-  radio:backdrop:indeterminate:disabled, check:disabled, check:disabled:backdrop,
-  radio:disabled,
-  radio:disabled:backdrop {
-    border-color: #d9d9d9;
-    background-image: image(#ffffff); }
-  check:checked,
-  radio:checked {
-    background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%);
-    border-color: #0051da;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
-    check:checked:active,
-    radio:checked:active {
-      box-shadow: none; }
-    check:checked:backdrop,
-    radio:checked:backdrop {
-      background-image: image(#2777ff); }
-  check:indeterminate,
-  radio:indeterminate {
-    background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%);
-    border-color: #0051da;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
-    check:indeterminate:active,
-    radio:indeterminate:active {
-      box-shadow: none; }
-    check:indeterminate:backdrop,
-    radio:indeterminate:backdrop {
-      background-image: image(#2777ff); }
+
+check:checked, check:indeterminate, menu menuitem check:checked, menu menuitem check:indeterminate,
+radio:checked,
+radio:indeterminate, menu menuitem
+radio:checked, menu menuitem
+radio:indeterminate {
+  background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%);
+  border-color: #0051da;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+  check:checked:active, check:indeterminate:active, menu menuitem check:checked:active, menu menuitem check:indeterminate:active,
+  radio:checked:active,
+  radio:indeterminate:active, menu menuitem
+  radio:checked:active, menu menuitem
+  radio:indeterminate:active {
+    box-shadow: none; }
+  check:checked:backdrop, check:indeterminate:backdrop, menu menuitem check:checked:backdrop, menu menuitem check:indeterminate:backdrop,
+  radio:checked:backdrop,
+  radio:indeterminate:backdrop, menu menuitem
+  radio:checked:backdrop, menu menuitem
+  radio:indeterminate:backdrop {
+    background-image: image(#2777ff); }
+
+check:checked:disabled, check:indeterminate:disabled, menu menuitem check:checked:disabled, menu menuitem check:indeterminate:disabled,
+radio:checked:disabled,
+radio:indeterminate:disabled, menu menuitem radio:checked:disabled, menu menuitem radio:indeterminate:disabled, check:backdrop:checked:disabled, check:backdrop:indeterminate:disabled,
+radio:backdrop:checked:disabled,
+radio:backdrop:indeterminate:disabled, check:disabled, check:disabled:backdrop,
+radio:disabled,
+radio:disabled:backdrop {
+  border-color: #d9d9d9;
+  background-image: image(#ffffff); }
 
 /************
  * GtkScale *
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index cdd60272..60c095ee 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -76,19 +76,14 @@ radio {
   $_c: if($variant=='light', white, darken($bg_color, 2%));
   $_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
 
-  background-image: linear-gradient(to bottom, $_c 20%, darken($_c, 2%) 90%);
-  box-shadow: $_shadow;
-
-  @at-root %check_radio_disabled,
-  &:disabled {
-    &, &:backdrop {
-      border-color: $borders_color;
-      background-image: image($bg_color);
-    }
+  &, menu menuitem &, menu menuitem:hover & {
+      background-image: linear-gradient(to bottom, $_c 20%, darken($_c, 2%) 90%);
+      border-color: $alt_borders_color;
+      box-shadow: $_shadow;
   }
 
-  @each $t in (':checked'), (':indeterminate') {
-    &#{$t} {
+  &, menu menuitem & {
+    &:checked, &:indeterminate {
       background-image: linear-gradient(to bottom, $selected_bg_color 20%, darken($selected_bg_color, 2%) 90%);
       border-color: $selected_borders_color;
       box-shadow: inset 0 1px transparentize(white, .9), $_shadow;
@@ -98,6 +93,14 @@ radio {
       &:disabled { @extend %check_radio_disabled; }
     }
   }
+
+  @at-root %check_radio_disabled,
+  &:disabled {
+    &, &:backdrop {
+      border-color: $borders_color;
+      background-image: image($bg_color);
+    }
+  }
 }
 
 /************