diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/iconpicker/iconpicker.controller.js
index d8ad5432b4..997933f003 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/iconpicker/iconpicker.controller.js
@@ -8,10 +8,13 @@
  */
 function iconPickerController($scope, iconHelper) {
 
-    iconHelper.getIcons().then(function(icons){
-        $scope.icons = icons;
-    });
+   $scope.loading = true;
+
+   iconHelper.getIcons().then(function(icons) {
+      $scope.icons = icons;
+      $scope.loading = false;
+   });
 
 }
 
-angular.module("umbraco").controller("Umbraco.Editors.DocumentType.IconPickerController", iconPickerController);
\ No newline at end of file
+angular.module("umbraco").controller("Umbraco.Editors.DocumentType.IconPickerController", iconPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/iconpicker/iconpicker.html
index 80e52a5032..4e6440e54c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/iconpicker/iconpicker.html
@@ -23,9 +23,9 @@
         </select>
     </div>
 
-    <div class="umb-loader" ng-hide="icons"></div>
+    <umb-load-indicator ng-if="loading"></umb-load-indicator>
 
-    <div class="umb-control-group">
+    <div class="umb-control-group" ng-show="!loading">
         <ul class="umb-thumbnails thumbnails" ng-class="color">
             <li class="span1" ng-repeat="icon in icons|filter: searchTerm">
                 <a href="#" title="{{icon}}" class="thumbnail" ng-click="model.pickIcon(icon, color)" prevent-default>