diff --git a/core/search/css/results.css b/core/search/css/results.css
index 04f7b6dcb9..b62f7df3fe 100644
--- a/core/search/css/results.css
+++ b/core/search/css/results.css
@@ -18,23 +18,23 @@
 	box-sizing: content-box;
 }
 
-#searchresults #status {
+#searchresults .status {
 	background-color: rgba(255, 255, 255, .85);
 	height: 12px;
 	padding: 28px 0 28px 56px;
 	font-size: 18px;
 }
-.has-favorites:not(.hidden) ~ #searchresults #status {
+.has-favorites:not(.hidden) ~ #searchresults .status {
 	padding-left: 102px;
 }
-#searchresults #status.fixed {
+#searchresults .status.fixed {
 	position: fixed;
 	bottom: 0;
 	width: 100%;
 	z-index: 10;
 }
 
-#searchresults #status .spinner {
+#searchresults .status .spinner {
 	height: 16px;
 	width: 16px;
 	vertical-align: middle;
diff --git a/core/search/js/search.js b/core/search/js/search.js
index c7feeacf42..b49a4b8c6e 100644
--- a/core/search/js/search.js
+++ b/core/search/js/search.js
@@ -125,6 +125,7 @@
 
 						//show spinner
 						$searchResults.removeClass('hidden');
+						$status.addClass('status');
 						$status.html(t('core', 'Searching other places')+'<img class="spinner" alt="search in progress" src="'+OC.webroot+'/core/img/loading.gif" />');
 
 						// do the actual search query
@@ -209,8 +210,12 @@
 				var count = $searchResults.find('tr.result').length;
 				$status.data('count', count);
 				if (count === 0) {
-					$status.text(t('core', 'No search result in other places'));
+					$status.addClass('emptycontent').removeClass('status');
+					$status.html('');
+					$status.append('<div class="icon-search"></div>');
+					$status.append('<h2>' + t('core', 'No search result in other places') + '</h2>');
 				} else {
+					$status.removeClass('emptycontent').addClass('status');
 					$status.text(n('core', '{count} search result in other places', '{count} search results in other places', count, {count:count}));
 				}
 			}
@@ -383,4 +388,4 @@ OC.search.customResults = {};
 /**
  * @deprecated use get/setRenderer() instead
  */
-OC.search.resultTypes = {};
\ No newline at end of file
+OC.search.resultTypes = {};