diff --git a/src/sass/gtk/_colors-public.scss b/src/sass/gtk/_colors-public.scss
index 0cd325e..be5bc96 100644
--- a/src/sass/gtk/_colors-public.scss
+++ b/src/sass/gtk/_colors-public.scss
@@ -80,11 +80,11 @@ $wm_bg_unfocused: opacify($header_bg_backdrop, 1);
 //
 
 // unfocused window 'dot(s)'
-@define-color budgie_tasklist_indicator_color #{"" + $selected_fg_color};
+@define-color budgie_tasklist_indicator_color #{"" + $fg_color};
 // focused window 'line'
 @define-color budgie_tasklist_indicator_color_active #{"" + $selected_bg_color};
 // group-ed and unfocused window 'line(s)'
-@define-color budgie_tasklist_indicator_color_active_window #{"" + mix($selected_fg_color, $panel_bg, 100%)};
+@define-color budgie_tasklist_indicator_color_active_window #{"" + mix($selected_bg_color, opacify($header_bg, 1), 35%)};
 // attention 'dot'
 // FIXME: we can't fill whole widget backgrounds with our suggestion colour
 //        because of lacking specific style-class on 'needs_attention' state,
diff --git a/src/sass/gtk/apps/_budgie.scss b/src/sass/gtk/apps/_budgie.scss
index dcae893..e158ffa 100644
--- a/src/sass/gtk/apps/_budgie.scss
+++ b/src/sass/gtk/apps/_budgie.scss
@@ -430,7 +430,7 @@ popover.background.places-menu {
   }
 }
 
-$budgie_panel_radius: $wm_radius + $container_padding;
+$budgie_panel_radius: $wm_radius + $container_padding / 2;
 
 // Panel
 .budgie-panel {
@@ -448,12 +448,12 @@ $budgie_panel_radius: $wm_radius + $container_padding;
 
   .bottom & {
     &.dock-mode {
-      padding: $container_padding $container_padding - 2px;
+      padding: $container_padding / 2 $container_padding / 2 - 1px;
       margin-bottom: $container_padding;
 
       .icon-tasklist {
         .launcher {
-          margin: 0 2px;
+          margin: 0 1px;
         }
       }
     }
@@ -462,11 +462,11 @@ $budgie_panel_radius: $wm_radius + $container_padding;
   .left & {
     &.dock-mode {
       margin-left: $container_padding;
-      padding: $container_padding - 2px $container_padding;
+      padding: $container_padding / 2 - 1px $container_padding / 2;
 
       .icon-tasklist {
         .launcher {
-          margin: 2px 0;
+          margin: 1px 0;
         }
       }
     }
@@ -475,11 +475,11 @@ $budgie_panel_radius: $wm_radius + $container_padding;
   .right & {
     &.dock-mode {
       margin-right: $container_padding;
-      padding: $container_padding - 2px $container_padding;
+      padding: $container_padding / 2 - 1px $container_padding / 2;
 
       .icon-tasklist {
         .launcher {
-          margin: 2px 0;
+          margin: 1px 0;
         }
       }
     }