diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index a246ef585e..c6a8447342 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -201,7 +201,8 @@ input[type="button"] {
 }
 // Made for Umbraco, 2019
 .btn-selection {
-  .buttonBackground(@pinkLight, ligthen(@pinkLight, 20%), @blueExtraDark, @blueDark);
+    @btnSelectionBackgroundHover: darken(@pinkLight, 10%);
+  .buttonBackground(@pinkLight, @btnSelectionBackgroundHover, @blueExtraDark, @blueDark);
 }
 // Made for Umbraco, 2019, used for buttons that has to stand back.
 .btn-white {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
index adaf45b4b0..cf407b667f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
@@ -5,7 +5,7 @@
 
 .umb-layout-selector__active-layout {
    box-sizing: border-box;
-   border: 1px solid transparent;
+   border: 1px solid @inputBorder;
    cursor: pointer;
    height: 30px;
    width: 30px;
@@ -16,7 +16,7 @@
 }
 
 .umb-layout-selector__active-layout:hover {
-   border-color: @gray-8;
+   border-color: @inputBorderFocus;
 }
 
 .umb-layout-selector__dropdown {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index c1687636d3..291eef43e0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -90,13 +90,13 @@ input.umb-table__input {
 
 .umb-table-body .umb-table-row {
     color: @gray-5;
-    border-top: 1px solid @gray-8;
+    border-top: 1px solid @gray-9;
     cursor: pointer;
     font-size: 14px;
     position: relative;
     min-height: 52px;
     &:hover {
-        background-color: @gray-10;
+        background-color: @ui-option-hover;
     }
 }
 
@@ -151,12 +151,26 @@ input.umb-table__input {
 
 // Show checkmark when checked, hide file icon
 .umb-table-row--selected {
+    /*
     .umb-table-body__fileicon {
         display: none;
     }
     .umb-table-body__checkicon {
         display: inline-block;
     }
+    */
+    &::before {
+        content: "";
+        position: absolute;
+        z-index:1;
+        top: 1px;
+        left: 1px;
+        right: 1px;
+        bottom: 1px;
+        border: 2px solid @ui-selected-border;
+        box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
+        pointer-events: none;
+    }
 }
 
 // Table Row Styles