diff --git a/src/app/components/generic-error/generic-error.component.scss b/src/app/components/generic-error/generic-error.component.scss
index dfe6c6039..a3b5b67f1 100644
--- a/src/app/components/generic-error/generic-error.component.scss
+++ b/src/app/components/generic-error/generic-error.component.scss
@@ -1,5 +1,7 @@
 @import 'variables';
 
+$alfresco-warn-color--hue-2: #ff5252;
+
 .generic-error {
     color: $alfresco-secondary-text-color;
     display: flex;
diff --git a/src/app/components/header/header.component.scss b/src/app/components/header/header.component.scss
index 540030c99..1ef205891 100644
--- a/src/app/components/header/header.component.scss
+++ b/src/app/components/header/header.component.scss
@@ -1,5 +1,7 @@
 @import 'variables';
 
+$app-menu-height: 64px;
+
 .app-menu {
     height: $app-menu-height;
 
diff --git a/src/app/components/location-link/location-link.component.ts b/src/app/components/location-link/location-link.component.ts
index 91c74e3d0..dc198a35d 100644
--- a/src/app/components/location-link/location-link.component.ts
+++ b/src/app/components/location-link/location-link.component.ts
@@ -39,7 +39,7 @@ import { Observable } from 'rxjs/Rx';
     encapsulation: ViewEncapsulation.None,
     // tslint:disable-next-line:use-host-property-decorator
     host: {
-        'class': 'app-location-link'
+        'class': 'app-location-link adf-location-cell'
     }
 })
 export class LocationLinkComponent implements OnInit {
diff --git a/src/app/ui/_layout.scss b/src/app/ui/_layout.scss
index 1ec13017a..e64871faf 100644
--- a/src/app/ui/_layout.scss
+++ b/src/app/ui/_layout.scss
@@ -4,6 +4,8 @@ $app-layout--header-height: 65px;
 $app-layout--side-width: 320px;
 $app-inner-layout--header-height: 48px;
 $app-inner-layout--footer-height: 48px;
+$alfresco-divider-color: rgba($alfresco-black, .07);
+$alfresco-gray-background: #fafafa;
 
 .layout {
     @include flex-column;
diff --git a/src/app/ui/_variables-color.scss b/src/app/ui/_variables-color.scss
deleted file mode 100644
index b993b6936..000000000
--- a/src/app/ui/_variables-color.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-// Primary color palette
-// - please note that Hue 2 and Enhanced Hue 1 and 2
-// are missing from specs
-$alfresco-app-color--default: #00bcd4;
-$alfresco-app-color--hue-1: #e0f7fa;
-$alfresco-app-color--hue-3: #0097a7;
-
-// Primary color palette - Enhanced
-$alfresco-app-color--default-enhanced: #0097a7;
-$alfresco-app-color--hue-3-enhanced: #006064;
-
-// Accent color palette
-$alfresco-primary-accent--default: #ff9100;
-$alfresco-primary-accent--hue-1: #ffd180;
-$alfresco-primary-accent--hue-2: #ffab40;
-$alfresco-primary-accent--hue-3: #ff6d00;
-
-$alfresco-secondary-accent--default: #3d5afe;
-$alfresco-secondary-accent--hue-1: #8c9eff;
-$alfresco-secondary-accent--hue-2: #536dfe;
-$alfresco-secondary-accent--hue-3: #304ffe;
-
-// Warn color palette
-$alfresco-warn-color--default: #ff1744;
-$alfresco-warn-color--hue-1: #ff8a80;
-$alfresco-warn-color--hue-2: #ff5252;
-$alfresco-warn-color--hue-3: #d50000;
-
-// Grayscale
-$alfresco-white: #fff;
-$alfresco-black: #000;
-
-// Dark
-$alfresco-dark-color--default: #78909c;
-$alfresco-dark-color--hue-1: #eceff1;
-$alfresco-dark-color--hue-3: #546e7a;
-
-$alfresco-drop-shadow: #888888;
-
-$alfresco-primary-text-color: rgba($alfresco-black, .87);
-$alfresco-secondary-text-color: rgba($alfresco-black, .54);
-
-$alfresco-hint-text-color: rgba($alfresco-black, .38);
-$alfresco-disabled-text-color: rgba($alfresco-black, .26);
-
-$alfresco-divider-color: rgba($alfresco-black, .07);
-
-$alfresco-gray-background: #fafafa;
diff --git a/src/app/ui/_variables.scss b/src/app/ui/_variables.scss
index 5f127abb4..25054d318 100644
--- a/src/app/ui/_variables.scss
+++ b/src/app/ui/_variables.scss
@@ -1,3 +1,13 @@
-@import './_variables-color.scss';
+// Primary color palette
+// - please note that Hue 2 and Enhanced Hue 1 and 2
+// are missing from specs
+$alfresco-app-color--default: #00bcd4;
+$alfresco-app-color--hue-1: #e0f7fa;
 
-$app-menu-height: 64px;
+// Grayscale
+$alfresco-white: #fff;
+$alfresco-black: #000;
+
+// Dark
+$alfresco-primary-text-color: rgba($alfresco-black, .87);
+$alfresco-secondary-text-color: rgba($alfresco-black, .54);
diff --git a/src/app/ui/overrides/_alfresco-document-list.scss b/src/app/ui/overrides/_alfresco-document-list.scss
index ed72c7f30..43846d3a4 100644
--- a/src/app/ui/overrides/_alfresco-document-list.scss
+++ b/src/app/ui/overrides/_alfresco-document-list.scss
@@ -1,5 +1,4 @@
-@import 'variables-color';
-
+@import 'variables';
 @import 'mixins';
 
 adf-document-list {
@@ -53,19 +52,6 @@ adf-datatable {
         text-align: left;
     }
 
-    .app-location-link,
-    .adf-location-cell {
-        a {
-            text-decoration: none;
-            color: $alfresco-primary-text-color;
-
-            &:hover {
-                color: #2196F3;
-                text-decoration: underline;
-            }
-        }
-    }
-
     .adf-datatable-body .adf-data-table-cell--image {
         padding-left: 24px;
         padding-right: 0;
diff --git a/src/app/ui/overrides/_alfresco-upload-dialog.scss b/src/app/ui/overrides/_alfresco-upload-dialog.scss
index f99215636..76d9a1382 100644
--- a/src/app/ui/overrides/_alfresco-upload-dialog.scss
+++ b/src/app/ui/overrides/_alfresco-upload-dialog.scss
@@ -1,5 +1,9 @@
 @import 'variables';
 
+$alfresco-primary-accent--hue-3: #ff6d00;
+$alfresco-warn-color--hue-3: #d50000;
+$alfresco-dark-color--hue-3: #546e7a;
+
 .upload-dialog {
     z-index: 999;
 }