diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 6c6a1455..cfd0d31c 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -84,14 +84,15 @@ $solid_borders_color:               if($variant == 'light', darken($bg_color, 12
 $dark_solid_borders_color:          if($variant == 'light', darken($bg_color, 12%), darken($bg_color, 5%));
 $highlight_color:                   if($variant == 'light', rgba(white, 0.15), rgba(white, 0.1));
 
-// Background colors
+// Gnome-shell background colors
 $dark_bg_color:                     rgba(black, 0.6);
 $alt_dark_bg_color:                 rgba(black, 0.3);
 
+// for gnome-shell keyboard
 $solid_bg_color:                    if($variant == 'light', #eeeeee, #555555);
 $alt_solid_bg_color:                if($variant == 'light', #c0c0c0, #242424);
 
-@if $colorscheme == 'nord' { // for gnome-shell keyboard
+@if $colorscheme == 'nord' {
   $solid_bg_color:                  if($variant == 'light', #eaecf0, #464f62);
   $alt_solid_bg_color:              if($variant == 'light', #b6bdca, #1e222a);
 }
@@ -117,9 +118,9 @@ $alt_disabled_fg_color:             if($variant == 'light', transparentize($alt_
 $disabled_bg_color:                 if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%));
 
 // Headerbar colors
-$header_bg:                       if($variant == 'light', #ffffff, if($darker == 'true', #1e1e1e, #373737));
-$header_highlight:                if($variant == 'dark', if($darker == 'true', #242424, #434343), #f5f5f5); // For metacity
-$header_fg:                       if($variant == 'light', #575757, #FDFDFD);
+$header_bg:                         if($variant == 'light', #ffffff, if($darker == 'true', #1e1e1e, #373737));
+$header_highlight:                  if($variant == 'dark', if($darker == 'true', #242424, #434343), #f5f5f5); // For metacity
+$header_fg:                         if($variant == 'light', #575757, #FDFDFD);
 
 @if $colorscheme == 'nord' {
   $header_bg:                       if($variant == 'light', #fbfcfd, if($darker == 'true', #191c23, #2e3440));
@@ -229,6 +230,7 @@ $panel_fg:                          if($trans == 'true' and $panel_font == 'whit
 $panel_track:                       if(($trans == 'false' or $panel_font == 'black') and $variant == 'light', rgba(black, 0.15), rgba(white, 0.28));
 $panel_divider:                     if(($trans == 'false' or $panel_font == 'black') and $variant == 'light', rgba(black, 0.08), rgba(white, 0.15));
 
+$dash_fg:                           if($variant == 'light', black, white);
 $dash_bg:                           if($variant == 'light', rgba(#d1d1d1, $panel_opacity + 0.33), rgba(if($darker == 'true', #1f1f1f, #222222), $panel_opacity/2 + 0.6));
 
 @if $trans == 'true' and $panel_font == 'black' {
@@ -243,8 +245,6 @@ $dash_bg:                           if($variant == 'light', rgba(#d1d1d1, $panel
   }
 }
 
-$dash_fg: if($variant == 'light', black, white);
-
 // Entry colors
 $entry_bg:                          if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05));
 $entry_shell_bg:                    if($variant == 'light', rgba(black, 0.1), rgba(white, 0.1));
@@ -265,13 +265,8 @@ $header_button_checked_bg:          if($variant == 'dark', lighten($header_bg, 4
 
 // Button borders and highlights colors
 $button_highlight:                  if($variant == 'light', white, rgba(white, 0.1));
-
 $button_borders:                    if($variant == 'light', $button_border, $dark_borders_color);
 
-$header_button_highlight:           if($variant == 'light', white, #767676);
-$header_button_hover_highlight:     if($variant == 'light', white, #868686);
-$header_button_checked_highlight:   if($variant == 'light', $borders_color, #cecece);
-
 // WM colors
 $wm_outline_light:                  0 0 0 2px rgba(black, 0.03), 0 0 0 1px rgba(black, 0.12);
 $wm_outline_dark:                   0 0 0 2px rgba(black, 0.1), 0 0 0 1px rgba(black, 0.75);
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index ba0ca956..ae7fd667 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -191,7 +191,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
 .popup-separator-menu-item {
   background: none;
   border: none;
-  height: 1px !important;
+  min-height: 0;
 
   .popup-separator-menu-item-separator {
     height: 1px; //not really the whole box
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 01e5139b..73306bf0 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -65,6 +65,12 @@ $list_shadow: if($variant == 'light',
   background-color: if($variant == 'light', rgba(black, 0.03), rgba(white, 0.05));
   border: none;
 
+  @if $colorscheme == 'nord' {
+    background-color: if($variant == 'light', rgba(#2e3440, 0.06), rgba(#4c566a, 0.25));
+  } @else {
+    background-color: if($variant == 'light', rgba(black, 0.03), rgba(white, 0.05));
+  }
+
   > separator { background: none; min-height: 0; }
 }
 
@@ -1950,6 +1956,13 @@ window.background > box.vertical > headerbar:not(.titlebar) { // reset headerbar
 //
 // Pathbars
 //
+
+$pathbar_button_checked_bg: if($variant == 'light', #808080, #b8b8b8);
+
+@if $colorscheme == 'nord' {
+  $pathbar_button_checked_bg: if($variant == 'light', #6b7894, #adb4c3);
+}
+
 .background .path-bar button {
   min-width: 12px;
   min-height: if($variant == 'light', 24px, 26px);
@@ -1962,7 +1975,7 @@ window.background > box.vertical > headerbar:not(.titlebar) { // reset headerbar
   &:hover { box-shadow: none; }
 
   &:active, &:checked {
-    background-color: if($variant == 'light', rgba(black, 0.5), rgba(white, 0.65));
+    background-color: $pathbar_button_checked_bg;
     color: if($variant == 'light', rgba(white, 1), rgba(black, 0.75));
     border-color: $button_borders;
   }