diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index f9bb860b5e..70b60f810e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -243,11 +243,12 @@ input[type="color"],
 .uneditable-input {
   background-color: @inputBackground;
   border: 1px solid @inputBorder;
+  
   .transition(~"border linear .2s, box-shadow linear .2s");
 
   // Focus state
   &:focus {
-    border-color: none;
+    border-color: @inputBorderFocus;
     outline: 0;
     outline: none \9; /* IE6-9 */
   }
@@ -817,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; }
+.group-selector .group-selector-buttons { float: left; margin: 24px 16px; }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 51892106e1..b363170ebc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -120,7 +120,7 @@ h5.-black {
   margin: 20px;
 }
 .umb-control-group {
-  border-bottom: 1px solid @gray-10;
+  border-bottom: 1px solid @gray-11;
   padding-bottom: 20px;
   margin-bottom: 15px !important;
 }
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 c0364f4ad8..57df982fd3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -230,6 +230,18 @@
 //
 // Media picker
 // --------------------------------------------------
+
+.umb-mediapicker > div {
+    border: 1px solid @inputBorder;
+}
+.umb-mediapicker-single > div {
+    width:144px;
+}
+.umb-mediapicker-multi > div {
+    width:100%;
+}
+
+
 .umb-mediapicker .add-link {
     display: flex;
     justify-content:center;
@@ -330,19 +342,28 @@
     justify-content: center;
     align-items: center;
     flex-wrap: wrap;
-    padding: 2px;
+    padding: 5px;
     margin: 5px;
     background: @white;
-    border: 1px solid @gray-10;
+    //border: 1px solid @gray-10;
     max-width: 100%;
 }
+.umb-mediapicker {
+    
+    .umb-sortable-thumbnails li {
+        border:none;
+    }
+    
+}
+
 
 
 .umb-mediapicker .umb-sortable-thumbnails li {
     flex-direction: column;
-    margin: 0 0 5px 5px;
-    padding: 5px;
 }
+/*.umb-mediapicker .umb-sortable-thumbnails li.add-wrapper {
+    padding: 0px;
+}*/
 
 .umb-sortable-thumbnails li:hover a {
     display: flex;
@@ -445,6 +466,9 @@
     align-items: center;
     margin-left: 5px;
     text-decoration: none;
+    
+    //border-color: @inputBorder;
+    .box-shadow(0 1px 2px rgba(0,0,0,0.25));
 }
 
 .umb-sortable-thumbnails .umb-sortable-thumbnails__action.-red {
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index 4d3a680523..9aae9840d1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -42,7 +42,6 @@
 }
 
 .umb-rte .mce-tinymce .mce-edit-area {
-    border: 1px solid @gray-8 !important;
     border-radius: 0px !important;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 31d0095836..f5685059c9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -74,6 +74,7 @@
 @gray-8:                #D8D7D9;
 @gray-9:                #E9E9EB;
 @gray-10:               #F3F3F5;
+@gray-11:               #F6F6F7;
 
 @sand-1:                hsl(22, 33%, 93%);// added 2019
 @sand-2:                hsl(22, 34%, 88%);// added 2019
@@ -362,7 +363,8 @@
 // Forms
 // -------------------------
 @inputBackground:               @white;
-@inputBorder:                   @gray-7;
+@inputBorder:                   @gray-8;
+@inputBorderFocus:              @gray-7;
 @inputBorderRadius:             0;
 @inputDisabledBackground:       @gray-10;
 @formActionsBackground:         @gray-9;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index 4e85668c05..d2b923b17c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -1,4 +1,4 @@
-<div class="umb-property-editor umb-mediapicker" ng-controller="Umbraco.PropertyEditors.MediaPickerController">
+<div class="umb-property-editor umb-mediapicker" ng-class="{'umb-mediapicker-multi':isMultiPicker, 'umb-mediapicker-single':!isMultiPicker}" ng-controller="Umbraco.PropertyEditors.MediaPickerController">
 
     <p ng-if="(mediaItems|filter:{trashed:true}).length == 1"><localize key="mediaPicker_pickedTrashedItem"></localize></p>
     <p ng-if="(mediaItems|filter:{trashed:true}).length > 1"><localize key="mediaPicker_pickedTrashedItems"></localize></p>