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 8597087efa..4ac69503e8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -762,8 +762,7 @@
 }
 
 .umb-fileupload .file-icon {
-  text-align: center;
-  display: block;
+  display: inline-block;
   position: relative;
   padding: 5px 0;
 
@@ -782,7 +781,7 @@
     line-height: 130%;
     position: absolute;
     top: 45px;
-    left: 110px;
+    left: 10px;
   }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
index dea532b7ea..6c73122464 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
@@ -26,19 +26,26 @@
                         </div>
                     </div>
 
-                    <div class="span4 thumbnail" ng-if="!file.isImage && file.extension != 'svg'">
-                        <span class="file-icon-wrap">
-                            <span class="file-icon">
-                                <i class="icon icon-document"></i>
-                                <span ng-if="file.isClientSide">.{{file.extension}}</span>
-                                <a ng-if="!file.isClientSide" href="{{file.fileSrc}}" target="_blank">
+                    <div ng-if="!file.isImage && file.extension != 'svg'">
+                        <a class="span6 thumbnail tc" ng-show="!file.isClientSide" ng-href="{{file.fileName}}" target="_blank">
+                            <span class="file-icon-wrap">
+                                <span class="file-icon">
+                                    <i class="icon icon-document"></i>
                                     <span>.{{file.extension}}</span>
-                                </a>
+                                </span>
                             </span>
-                        </span>
-                        <div style="text-align: center">{{file.fileName}}</div>
+                            <div>{{file.fileName}}</div>
+                        </a>
+                        <div class="span6 thumbnail tc" ng-show="file.isClientSide">
+                            <span class="file-icon-wrap">
+                                <span class="file-icon">
+                                    <i class="icon icon-document"></i>
+                                    <span>.{{file.extension}}</span>
+                                </span>
+                            </span>
+                            <div>{{file.fileName}}</div>
+                        </div>
                     </div>
-
                 </div>
 
                 <div>