diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
index cde88c93e7..9bfe943287 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
@@ -59,7 +59,7 @@ angular.module("umbraco.directives")
             node.stateCssClass = (node.cssClasses || []).join(" ");
 
             if (node.style) {
-                $(element).find("i").attr("style", node.style);
+                $(element).find("i:first").attr("style", node.style);
             }
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js
index e3689250d9..e3e4ade362 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js
@@ -37,16 +37,19 @@ angular.module("umbraco")
                 mediaResource.getChildren(id)
                     .then(function(data) {
                         $scope.images = data.items;
-
-                        var path = editorState.current.path;
-                        navigationService.syncTree({ tree: "media", path: path, forceReload: true }).then(function (syncArgs) {
-                            $log.log(syncArgs.node);
-                        });
                     });    
             };
 
             $scope.$on('fileuploadstop', function(event, files){
                 $scope.loadChildren($scope.options.formData.currentFolder);
+                
+                //sync the tree - don't force reload since we're not updating this particular node (i.e. its name or anything),
+                // then we'll get the resulting tree node which we can then use to reload it's children.
+                var path = editorState.current.path;
+                navigationService.syncTree({ tree: "media", path: path, forceReload: false }).then(function (syncArgs) {
+                    navigationService.reloadNode(syncArgs.node);
+                });
+
                 $scope.queue = [];
                 $scope.filesUploading = [];
             });