diff --git a/public/sass/components/_page_loader.scss b/public/sass/components/_page_loader.scss
index 6fb5ea8ffb2..0a3eac40a0c 100644
--- a/public/sass/components/_page_loader.scss
+++ b/public/sass/components/_page_loader.scss
@@ -7,7 +7,7 @@
 
   &__spinner {
     font-size: 32px;
-    margin-bottom: $space-s;
+    margin-bottom: $space-sm;
   }
 
   &__text {
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index 81d6e4e9e17..8acf98be1b2 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -21,7 +21,7 @@
 }
 
 .panel-editor-container__editor {
-  margin-top: $space-l;
+  margin-top: $space-lg;
   display: flex;
   flex-direction: row;
   flex: 1 1 0;
@@ -80,7 +80,7 @@
   }
 
   .submenu-controls {
-    padding: 0 $dashboard-padding $space-s $dashboard-padding;
+    padding: 0 $dashboard-padding $space-sm $dashboard-padding;
   }
 
   .panel-editor-container__panel {
diff --git a/public/sass/components/_panel_logs.scss b/public/sass/components/_panel_logs.scss
index edb72b829e2..7c36a751572 100644
--- a/public/sass/components/_panel_logs.scss
+++ b/public/sass/components/_panel_logs.scss
@@ -6,7 +6,7 @@ $column-horizontal-spacing: 10px;
   padding: $panel-padding;
   padding-top: 10px;
   border-radius: $border-radius;
-  margin: $space-m 0 $space-s;
+  margin: $space-md 0 $space-sm;
   border: $panel-border;
   flex-direction: column;
 }
diff --git a/public/sass/components/_submenu.scss b/public/sass/components/_submenu.scss
index a70b1e46676..514aa44525e 100644
--- a/public/sass/components/_submenu.scss
+++ b/public/sass/components/_submenu.scss
@@ -4,7 +4,7 @@
   flex-wrap: wrap;
   align-content: flex-start;
   align-items: flex-start;
-  padding: 0 0 $space-s 0;
+  padding: 0 0 $space-sm 0;
 }
 
 .annotation-disabled,
diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss
index a68d7f1dcb6..d3b1c291547 100644
--- a/public/sass/pages/_explore.scss
+++ b/public/sass/pages/_explore.scss
@@ -197,7 +197,7 @@
 }
 
 .explore-panel {
-  margin-top: $space-s;
+  margin-top: $space-sm;
 }
 
 .explore-panel__body {
@@ -216,20 +216,20 @@
 
 .explore-panel__header-label {
   font-weight: 500;
-  margin-right: $space-s;
+  margin-right: $space-sm;
   font-size: $font-size-h6;
   box-shadow: $text-shadow-faint;
 }
 
 .explore-panel__header-buttons {
-  margin-right: $space-s;
+  margin-right: $space-sm;
   font-size: $font-size-lg;
   line-height: $font-size-h6;
 }
 
 .time-series-disclaimer {
   width: 300px;
-  margin: $space-s auto;
+  margin: $space-sm auto;
   padding: 10px 0;
   border-radius: $border-radius;
   text-align: center;
@@ -407,7 +407,7 @@
 .ReactTable .-pagination {
   border-top: none;
   box-shadow: none;
-  margin-top: $space-s;
+  margin-top: $space-sm;
 }
 .ReactTable .-pagination .-btn {
   color: $blue;
@@ -448,7 +448,7 @@
 // TODO Experimental
 
 .cheat-sheet-item {
-  margin: $space-l 0;
+  margin: $space-lg 0;
   width: 50%;
 }