diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
index 75b588aff3..42e32e1a83 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
@@ -12,7 +12,7 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
 	                           ng-model="searchTerm" 
 	                           class="umb-search-field search-query" 
 	                           placeholder="Filter..."
-	                           on-keyup="performSearch(searchTerm)">
+	                           >
 	                </div>
 	        </div>
 
@@ -56,16 +56,23 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
         <div style="height: 10px; margin: 10px 0px 10px 0px" class="umb-loader" ng-hide="active() == 0"></div>
 
         <ul class="thumbnails">
-	        <li class="span2 folder" ng-repeat="image in images | orderBy:'contentTypeAlias'">
+	        <li class="span2 folder" ng-repeat="image in images | orderBy:'contentTypeAlias' | filter:searchTerm">
 			    <a href="#" class="thumbnail" ng-class="{selected: dialogData.selection.indexOf(image) > -1}" 
 	               ng-click="selectMediaItem(image)" 
 	               prevent-default>
 					
-                    <div ng-switch on="image.contentTypeAlias" >
-                        <img ng-src="{{image.thumbnail}}" ng-switch-when="Image" alt="{{image.name}}"/>
-                        <i ng-switch-default class="icon-folder-close"></i>
-                    </div>       
-	                {{image.name}}
+
+	               	<img ng-src="{{image.thumbnail}}" ng-switch-when="Image" alt="{{image.name}}"/>	
+
+
+                    <div ng-switch on="!!image.thumbnail" >
+                        <img ng-src="{{image.thumbnail}}" class="image" ng-switch-when="true" alt="{{image.name}}"/>
+
+                        <div ng-switch-default>
+                        	<i class="{{image.icon}}"></i>
+                        	{{image.name}}
+                        </div>
+                    </div>
 	            </a>
 	        </li>
 	    </ul>
diff --git a/src/Umbraco.Web.UI/umbraco/Views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI/umbraco/Views/common/dialogs/mediapicker.html
index 75b588aff3..42e32e1a83 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/common/dialogs/mediapicker.html
+++ b/src/Umbraco.Web.UI/umbraco/Views/common/dialogs/mediapicker.html
@@ -12,7 +12,7 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
 	                           ng-model="searchTerm" 
 	                           class="umb-search-field search-query" 
 	                           placeholder="Filter..."
-	                           on-keyup="performSearch(searchTerm)">
+	                           >
 	                </div>
 	        </div>
 
@@ -56,16 +56,23 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
         <div style="height: 10px; margin: 10px 0px 10px 0px" class="umb-loader" ng-hide="active() == 0"></div>
 
         <ul class="thumbnails">
-	        <li class="span2 folder" ng-repeat="image in images | orderBy:'contentTypeAlias'">
+	        <li class="span2 folder" ng-repeat="image in images | orderBy:'contentTypeAlias' | filter:searchTerm">
 			    <a href="#" class="thumbnail" ng-class="{selected: dialogData.selection.indexOf(image) > -1}" 
 	               ng-click="selectMediaItem(image)" 
 	               prevent-default>
 					
-                    <div ng-switch on="image.contentTypeAlias" >
-                        <img ng-src="{{image.thumbnail}}" ng-switch-when="Image" alt="{{image.name}}"/>
-                        <i ng-switch-default class="icon-folder-close"></i>
-                    </div>       
-	                {{image.name}}
+
+	               	<img ng-src="{{image.thumbnail}}" ng-switch-when="Image" alt="{{image.name}}"/>	
+
+
+                    <div ng-switch on="!!image.thumbnail" >
+                        <img ng-src="{{image.thumbnail}}" class="image" ng-switch-when="true" alt="{{image.name}}"/>
+
+                        <div ng-switch-default>
+                        	<i class="{{image.icon}}"></i>
+                        	{{image.name}}
+                        </div>
+                    </div>
 	            </a>
 	        </li>
 	    </ul>