diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
index 67b5a0495e..18275631dd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
@@ -1,5 +1,5 @@
 .umb-child-selector__child {
-  background: @grayLighter;
+  background: @gray-10;
   padding: 5px 15px;
   margin-bottom: 5px;
   min-width: 300px;
@@ -8,13 +8,13 @@
 }
 
 .umb-child-selector__child.-parent {
-  background: #f1f1f1;
+  background: @gray-9;
   padding-top: 10px;
   padding-bottom: 10px;
 }
 
 .umb-child-selector__child.-placeholder {
-  border: 1px dashed @grayLight;
+  border: 1px dashed @gray-8;
   background: none;
   cursor: pointer;
   text-align: center;
@@ -42,11 +42,11 @@
 }
 
 .umb-child-selector__child-name {
-  font-size: 13px;
+  font-size: 14px;
 }
 
 .umb-child-selector__child-name.-blue {
-  color: @blue;
+  color: @turquoise-d1;
 }
 
 .umb-child-selector__child-actions {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less
index d05bc9fc43..3753aa08c3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less
@@ -8,8 +8,8 @@
   width: 125px;
   height: 150px;
   padding: 20px;
-  background: #f8f8f8;
-  border: 1px solid #CCCCCC;
+  background: @gray-10;
+  border: 1px solid @gray-7;
   text-align: center;
   margin: 0 20px 20px 0;
   display: flex;
@@ -24,7 +24,7 @@
 }
 
 .umb-grid-selector__item.-placeholder {
-  border: 1px dashed #d9d9d9;
+  border: 1px dashed @gray-8;
   background: none;
   cursor: pointer;
 }
@@ -35,19 +35,19 @@
 
 .umb-grid-selector__item-icon {
   font-size: 50px;
-  color: #d9d9d9;
+  color: @gray-8;
   display: block;
   line-height: 50px;
   margin-bottom: 5px;
 }
 
 .umb-grid-selector__item-label {
-  font-size: 13px;
+  font-size: 14px;
   font-weight: bold;
 }
 
 .umb-grid-selector__item-label.-blue {
-  color: @blue;
+  color: @turquoise-d1;
 }
 
 .umb-grid-selector__item-remove {
@@ -58,17 +58,17 @@
 }
 
 .umb-grid-selector__item-default-label {
-  font-size: 10px;
-  color: @gray;
+  font-size: 12px;
+  color: @gray-3;
   font-weight: bold;
   position: relative;
   top: -3px;
 }
 
 .umb-grid-selector__item-default-label.-blue {
-  color: @blue;
+  color: @turquoise-d1;
 }
 
 .umb-grid-selector__item-add {
-  color: @blue;
+  color: @turquoise-d1;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index 46a74f7d8b..ecd8b2923b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -9,7 +9,7 @@
 .umb-group-builder__group {
   min-height: 86px;
   margin: 50px 0 0 0;
-  border: 2px solid #CCCCCC;
+  border: 2px solid @gray-7;
   border-radius: 0 10px 10px 10px;
   position: relative;
   padding: 10px 10px 5px 10px;
@@ -17,11 +17,11 @@
 }
 
 .umb-group-builder__group.-active {
-  border-color: @blue;
+  border-color: @turquoise;
 }
 
 .umb-group-builder__group.-inherited {
-  border-color: #F2F2F2;
+  border-color: @gray-9;
   animation: fadeIn 0.5s;
 }
 
@@ -31,8 +31,8 @@
   justify-content: center;
   align-items: center;
   cursor: pointer;
-  border: 1px dashed @grayLight;
-  color: @blue;
+  border: 1px dashed @gray-8;
+  color: @turquoise-d1;
   font-weight: bold;
 }
 
@@ -63,7 +63,7 @@
 
 .umb-group-builder__group-remove:hover {
   cursor: pointer;
-  color: @blueDark;
+  color: @turquoise;
 }
 
 .umb-group-builder__group-title-wrapper {
@@ -96,11 +96,11 @@
 }
 
 .umb-group-builder__group-title.-active {
-  border-color: @blue;
+  border-color: @turquoise;
 }
 
 .umb-group-builder__group-title.-placeholder {
-  border: 1px dashed @grayLight;
+  border: 1px dashed @gray-8;
   border-bottom: none;
   width: 70px;
 }
@@ -127,7 +127,7 @@ input.umb-group-builder__group-title-input {
 
 .umb-group-builder__group-inherited-label {
   font-size: 13px;
-  color: @grayLight;
+  color: @gray-8;
   display: inline-block;
   position: relative;
   top: 2px;
@@ -176,7 +176,7 @@ input.umb-group-builder__group-sort-value {
 
 .umb-group-builder__property.-placeholder {
   background: #ffffff;
-  border: 1px dashed @grayLight;
+  border: 1px dashed @gray-8;
   border-radius: 5px;
   cursor: pointer;
   align-items: center;
@@ -217,7 +217,7 @@ input.umb-group-builder__group-sort-value {
 }
 
 .umb-group-builder__property.-sortable-locked {
-  background: @grayLighter;
+  background: @gray-10;
   padding-left: 30px;
 }
 
@@ -305,7 +305,7 @@ input.umb-group-builder__group-sort-value {
   left: 0;
   text-transform: uppercase;
   z-index: 15;
-  background: @grayLighter;
+  background: @gray-10;
   padding: 3px;
   line-height: 12px;
   opacity: 0.8
@@ -326,7 +326,7 @@ input.umb-group-builder__group-sort-value {
 }
 
 .umb-group-builder__property-action:hover {
-    color: @blueDark;
+    color: @turquoise;
 }
 
 .umb-group-builder__property-tags {
@@ -345,7 +345,7 @@ input.umb-group-builder__group-sort-value {
 
 .umb-group-builder__property-tag {
     font-size: 11px;
-    background-color: @grayLight;
+    background-color: @gray-8;
     margin-left: 10px;
     padding: 0 4px;
     display: flex;
@@ -372,9 +372,9 @@ input.umb-group-builder__group-sort-value {
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 12px;
+  font-size: 13px;
   font-weight: bold;
-  color: @blue;
+  color: @turquoise-d1;
 }
 
 .umb-group-builder__placeholder-box.-input {
@@ -403,7 +403,7 @@ input.umb-group-builder__group-sort-value {
 
 .umb-group-builder__group-sortable-placeholder {
   background: transparent;
-  border: 1px dashed @grayLight;
+  border: 1px dashed @gray-8;
   margin: 0 0 70px 0;
   border-radius: 10px;
   border-radius: 5px;
@@ -411,7 +411,7 @@ input.umb-group-builder__group-sort-value {
 
 .umb-group-builder__property_sortable-placeholder {
   background: transparent;
-  border: 1px dashed @grayLight;
+  border: 1px dashed @gray-8;
   margin-bottom: 5px;
   border-radius: 5px;
 }
@@ -466,7 +466,7 @@ input.umb-group-builder__group-sort-value {
   }
 
   .editor-placeholder {
-    border: 1px dashed @grayLight;
+    border: 1px dashed @gray-8;
     width: 100%;
     height: 80px;
     line-height: 80px;
@@ -485,7 +485,7 @@ input.umb-group-builder__group-sort-value {
   .editor {
     margin-bottom: 10px;
     .editor-icon-wrapper {
-      border: 1px solid @grayLight;
+      border: 1px solid @gray-8;
       width: 60px;
       height: 60px;
       text-align: center;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
index 8c0f310cf3..4fb20f5c68 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
@@ -1,6 +1,6 @@
 .umb-list-view-settings__box {
-  background: #f8f8f8;
-  border: 1px solid #CCCCCC;
+  background: @gray-10;
+  border: 1px solid @gray-7;
   display: flex;
   animation: fadeIn 0.5s;
   padding: 15px;
@@ -21,7 +21,7 @@
 
 .umb-list-view-settings__list-view-icon {
   font-size: 20px;
-  color: #d9d9d9;
+  color: @gray-7;
   margin-right: 10px;
 }
 
@@ -33,17 +33,21 @@
 }
 
 .umb-list-view-settings__create-new {
-  font-size: 12px;
-  color: @blue;
+  font-size: 13px;
+  color: @turquoise-d1;
+}
+
+.umb-list-view-settings__create-new:hover {
+  color: @turquoise-d1;
 }
 
 .umb-list-view-settings__remove-new {
-  font-size: 12px;
+  font-size: 13px;
   color: @red;
 }
 
 .umb-list-view-settings__settings {
-  border: 1px dashed #d9d9d9;
+  border: 1px dashed @gray-7;
   border-top: none;
   padding: 20px;
 }