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 a06484b8a0..96deaef09a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -201,6 +201,15 @@ ul.color-picker li a  {
     margin: 5px;
     background: white;
     border: 1px solid #f8f8f8;
+
+    max-width: 100%;
+}
+
+
+.umb-mediapicker .umb-sortable-thumbnails li {
+    flex-direction: column;
+    margin: 0;
+    padding: 5px;
 }
 
 
@@ -384,6 +393,7 @@ ul.color-picker li a  {
 }
    .umb-cropper-gravity .viewport, .umb-cropper-gravity, .umb-cropper-imageholder {
         display: inline-block;
+        max-width: 100%;
     }
 
     .umb-cropper-imageholder {