diff --git a/src/sass/_empty_state.scss b/src/sass/_empty_state.scss
index 59e2fef315..2accfdf124 100644
--- a/src/sass/_empty_state.scss
+++ b/src/sass/_empty_state.scss
@@ -2,10 +2,10 @@
   margin-top: min(5vh, $spv--strip-regular);
 
   .empty-state-icon {
-    height: $sp-xx-large;
+    height: 2.5rem;
     margin-bottom: $spv--large;
     margin-top: $spv--x-large;
-    width: $sp-xx-large;
+    width: 2.5rem;
   }
 
   h4 {
diff --git a/src/sass/_file_row.scss b/src/sass/_file_row.scss
index 5a08c05aae..d6d4f400de 100644
--- a/src/sass/_file_row.scss
+++ b/src/sass/_file_row.scss
@@ -3,7 +3,7 @@
     align-items: center;
     display: flex;
     justify-content: flex-start;
-    padding: $sp-small;
+    padding: $spv--small $sph--small $spv--small $sph--small;
 
     .file-row-toggle {
       flex-grow: 1;
diff --git a/src/sass/_pattern_navigation.scss b/src/sass/_pattern_navigation.scss
index 03bd34793c..736b0caf61 100644
--- a/src/sass/_pattern_navigation.scss
+++ b/src/sass/_pattern_navigation.scss
@@ -99,7 +99,7 @@
 .sidenav-toggle-wrapper {
   background: $colors--dark-theme--background-default;
   bottom: 0;
-  padding: $spv--small $sph--x-large $sp-medium $sp-medium;
+  padding: $spv--small $sph--x-large $spv--large $sph--large;
   position: sticky;
   text-align: right;
 
diff --git a/src/sass/styles.scss b/src/sass/styles.scss
index 69b781ace9..987d525bc5 100644
--- a/src/sass/styles.scss
+++ b/src/sass/styles.scss
@@ -96,7 +96,7 @@ $border-thin: 1px solid $color-mid-light !default;
 }
 
 .u-loader {
-  margin: $sp-large;
+  margin: $spv--x-large $sph--x-large $spv--x-large $sph--x-large;
 }
 
 .p-bottom-controls {
@@ -185,7 +185,7 @@ $border-thin: 1px solid $color-mid-light !default;
   }
 
   .p-breadcrumbs__item:first-of-type {
-    margin-right: $sp-x-small;
+    margin-right: $sph--x-small;
   }
 }