diff --git a/gnome-shell-light.scss b/gnome-shell-dark-laptop.scss
similarity index 83%
rename from gnome-shell-light.scss
rename to gnome-shell-dark-laptop.scss
index ae6fce7..e603503 100644
--- a/gnome-shell-light.scss
+++ b/gnome-shell-dark-laptop.scss
@@ -1,5 +1,6 @@
-$variant: 'light';
+$variant: 'dark';
 
+$laptop: true;
 @import "gnome-shell-sass/_colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";
diff --git a/gnome-shell-dark.scss b/gnome-shell-dark.scss
index 8ee4999..4bf68e2 100644
--- a/gnome-shell-dark.scss
+++ b/gnome-shell-dark.scss
@@ -1,5 +1,6 @@
 $variant: 'dark';
 
+$laptop: false;
 @import "gnome-shell-sass/_colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";
diff --git a/gnome-shell-high-contrast.scss b/gnome-shell-high-contrast.scss
deleted file mode 100644
index 00f247e..0000000
--- a/gnome-shell-high-contrast.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-$variant: 'dark';
-
-@import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
-@import "gnome-shell-sass/_drawing";
-@import "gnome-shell-sass/_common";
-@import "gnome-shell-sass/_widgets";
-
-.toggle-switch { width: 48px; }
-.toggle-switch {
-  background-image: url("resource:///org/gnome/shell/theme/toggle-off-hc.svg");
-  &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-hc.svg"); }
-}
-
-//force opaque panel
-#panel {
-  &.login-screen,
-  &.unlock-screen,
-  &:overview {
-    background-color: #000;
-  }
-
-  .panel-button {
-    color: #fff !important;
-  }
-}
-
-//thumbnail app icons no dropshadow and forced color
-.window-picker .icon-dropshadow {
-  icon-shadow: none;
-  background-color: $osd_bg_color;
-  padding: $base_padding * 2;
-  border-radius: $modal_radius;
-}
diff --git a/gnome-shell-sass/widgets/_panel.scss b/gnome-shell-sass/widgets/_panel.scss
index c1d32c6..47595ab 100644
--- a/gnome-shell-sass/widgets/_panel.scss
+++ b/gnome-shell-sass/widgets/_panel.scss
@@ -127,7 +127,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
   }
 
   .panel-status-indicators-box {
-    spacing: 8px;
+    spacing: 2px;
     padding-right: 2px;
     padding-left: 3px;
   }
@@ -138,7 +138,14 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
 
   // spacing between power icon and (optional) percentage label
   .power-status.panel-status-indicators-box {
+    padding-left: 0px;
     spacing: 0;
+
+    @if $laptop {
+      margin-bottom: 2px;
+    } @else {
+      margin-left: 2px;
+    }
   }
 
   // important privacy related indicators