diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less
index a302ba71b8..0f4f2a7a9d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/card.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/card.less
@@ -70,7 +70,7 @@
      margin: 0;
  }
 
-.umb-card-list li{
+.umb-card-list li {
     border-bottom: @gray-10 1px solid;
     padding-bottom: 3px;
     display: block;
@@ -123,15 +123,15 @@
  .umb-card-grid .umb-card-grid-item:focus,
  .umb-card-grid .umb-card-grid-item:hover > *,
  .umb-card-grid .umb-card-grid-item:focus > *  {
-	background: @gray-10;
-	//color: white;
+	background: @ui-option-hover;
+	color: @ui-option-type-hover;
 	cursor: pointer;
 	outline: none;
 	border-radius: 3px;
 }
 
 .umb-card-grid a {
-     color: @gray-2;
+     color: @ui-option-type;
      text-decoration: none;
  }
 
@@ -139,7 +139,7 @@
      font-size: 30px;
      line-height: 50px;
      display: block;
-	  color: @gray-3;
+	  color: @ui-option-type;
  }
 
  .umb-card-grid .umb-card-grid-item__loading {
@@ -164,9 +164,9 @@
 }
 
 .umb-btn-round:hover, .umb-btn-round:hover *{
-  background: @turquoise !important;
+  background: @blueDark !important;
   color: @white !important;
-  border-color: @turquoise !important;
+  border-color: @blueDark !important;
   text-decoration:none;
  }
 
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 5db66da974..ba433e80d3 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
@@ -416,7 +416,7 @@ input.umb-group-builder__group-sort-value {
     }
 
     .editor-placeholder {
-        border: 1px dashed @gray-8;
+        border: 1px dashed @ui-action-border;
         width: 100%;
         height: 80px;
         line-height: 80px;
@@ -425,12 +425,12 @@ input.umb-group-builder__group-sort-value {
         border-radius: 5px;
         font-weight: bold;
         font-size: 14px;
-        color: @ui-active;
+        color: @ui-action-type;
         
         &:hover {
             text-decoration: none;
-            color:@ui-active-type-hover;
-            border-color:@ui-active-type-hover;
+            color:@ui-action-type-hover;
+            border-color:@ui-action-border-hover;
         }
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 70b60f810e..7b2afad20b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -201,7 +201,7 @@ input[type="color"],
   margin-bottom: @baseLineHeight / 2;
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
-  color: @gray-3;
+  color: @gray-2;
   .border-radius(@inputBorderRadius);
   vertical-align: middle;
   box-sizing: border-box;
@@ -818,4 +818,4 @@ legend + .control-group {
 /* User/group selector */
 .group-selector .group-selector-list { float: left; }
 .group-selector .group-selector-list div { height: 24px; }
-.group-selector .group-selector-buttons { float: left; margin: 24px 16px; }
\ No newline at end of file
+.group-selector .group-selector-buttons { float: left; margin: 24px 16px; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 57df982fd3..7c0383b415 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -246,7 +246,7 @@
     display: flex;
     justify-content:center;
     align-items:center;
-    width: 120px;
+    //width: 120px;
     text-align: center;
     color: @gray-9;
     border: 2px @gray-9 dashed;
@@ -295,7 +295,9 @@
 }
 
 .umb-mediapicker .add-link-square {
-  height: 120px;
+  height: 100px;
+  width: 100px;
+  margin: 10px;
 }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index f5685059c9..ea2f479101 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -161,16 +161,19 @@
 @ui-light-active-type-hover:  @blueMid;
 
 
-@ui-action:             @blueMid;
-@ui-action-hover:       @blueMid;
+@ui-action:             white;
+@ui-action-hover:       @brownLight;
 @ui-action-type:             @blueExtraDark;
 @ui-action-type-hover:       @blueMid;
+@ui-action-border:             @blueExtraDark;
+@ui-action-border-hover:       @blueMid;
 
 @ui-action-disgrete:              white;
 @ui-action-disgrete-hover:        @brownLight;
-
 @ui-action-disgrete-type:         @gray-4;
 @ui-action-disgrete-type-hover:   @blueMid;
+@ui-action-disgrete-border:         @gray-4;
+@ui-action-disgrete-border-hover:   @blueMid;
 
 @type-white:                      @white;
 @type-black:                      @blueNight;