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 082e8d079d..3bcf5db1b6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -122,7 +122,7 @@ ul.color-picker li a  {
 //
 // Media picker
 // --------------------------------------------------
-.umb-mediapicker .add-link{
+.umb-mediapicker .add-link {
   display: inline-block;
   height: 120px;
   width: 120px;
@@ -133,7 +133,7 @@ ul.color-picker li a  {
   text-decoration: none;
 }
 
-.umb-mediapicker .picked-image{
+.umb-mediapicker .picked-image {
   position: absolute;
   bottom: 10px;
   right: 10px;
@@ -178,12 +178,8 @@ ul.color-picker li a  {
 }
 
 
-.umb-sortable-thumbnails li{
+.umb-sortable-thumbnails li {
     display: inline-block;
-    border: 1px solid @grayLighter;
-    padding: 2px;
-    background: white;
-    margin: 5px;
     position: relative;
     text-align: center;
     vertical-align: top;
@@ -207,16 +203,6 @@ ul.color-picker li a  {
   max-height: none !important;
 }
 
-.umb-sortable-thumbnails .icon-holder .icon{
-  font-size: 60px;
-  line-height: 70px;
-}
-.umb-sortable-thumbnails .icon-holder *
-{
-  color: @grayLight;
-  display: block
-}
-
 
 //
 // Cropper
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
index d73f221764..c07e1f16aa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
@@ -1,10 +1,9 @@
 <div ng-controller="Umbraco.PrevalueEditors.ImageFilePickerController" class="umb-editor umb-mediapicker">
     <ul class="umb-sortable-thumbnails">
-        <li style="width: 120px; height: 100px; overflow: hidden;">
+        <li>
 
-                <a href ng-click="pick()" class="icon-holder" ng-hide="model.value">
-                    <i class="icon icon-add large" ></i>
-                    <small>Choose...</small>
+                <a href ng-click="pick()" class="icon-holder umb-mediapicker add-link" ng-hide="model.value">
+                    <i class="icon icon-add large"></i>
                 </a>
 
                 <img ng-src="{{model.value}}" alt="" ng-show="model.value">