diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index 40b6ddea99..105b107cf1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -188,13 +188,16 @@
 }
 
 /*ensures dialogs doesnt have side-by-side labels*/
-.umb-overlay .control-label {
+.umb-overlay .control-label,
+.umb-overlay .form-horizontal .control-label {
     width: 100%;
     display: block;
     box-sizing: border-box;
     margin-bottom: 10px;
+    float: none;
 }
 
+
 .umb-overlay .controls-row {
     margin-left: 0 !important;
 }
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 c07e1f16aa..d9d988d7e5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
@@ -1,16 +1,15 @@
 <div ng-controller="Umbraco.PrevalueEditors.ImageFilePickerController" class="umb-editor umb-mediapicker">
     <ul class="umb-sortable-thumbnails">
         <li>
-
-                <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">
-                <a href class="picked-image" ng-click="model.value = null" ng-show="model.value"><i class="icon icon-delete"></i></a>
+            <img ng-src="{{model.value}}" alt="" ng-show="model.value">
+            <a href class="picked-image" ng-click="model.value = null" ng-show="model.value"><i class="icon icon-delete"></i></a>
         </li>
     </ul>
 
+    <a href ng-click="pick()" class="umb-mediapicker add-link" ng-hide="model.value">
+        <i class="icon icon-add large"></i>
+    </a>
+
     <umb-overlay
       ng-if="mediaPickerDialog.show"
       model="mediaPickerDialog"