diff --git a/app/images/search-empty.png b/app/images/search-empty.png
new file mode 100644
index 00000000..7b20d009
Binary files /dev/null and b/app/images/search-empty.png differ
diff --git a/app/partials/includes/components/empty-search-results.jade b/app/partials/includes/components/empty-search-results.jade
new file mode 100644
index 00000000..be261c6c
--- /dev/null
+++ b/app/partials/includes/components/empty-search-results.jade
@@ -0,0 +1,6 @@
+img(
+    src="../../images/search-empty.png"
+    alt="{{ 'SEARCH.EMPTY_TITLE' | translate }}"
+)
+p.title {{ 'SEARCH.EMPTY_TITLE' | translate }}
+p {{ 'SEARCH.EMPTY_DESCRIPTION' | translate }}
diff --git a/app/partials/includes/modules/search-result-table.jade b/app/partials/includes/modules/search-result-table.jade
index be95d40c..2394f9da 100644
--- a/app/partials/includes/modules/search-result-table.jade
+++ b/app/partials/includes/modules/search-result-table.jade
@@ -18,10 +18,8 @@ script(type="text/ng-template", id="search-issues")
                 div.status(tg-listitem-issue-status="issue")
                 div.assigned-to(tg-listitem-assignedto="issue")
 
-    div.empty.empty-search-results(ng-class="{'hidden': issues.length}")
-                span.icon.icon-issues
-                span.title(translate="SEARCH.EMPTY_TITLE")
-                span(translate="SEARCH.EMPTY_DESCRIPTION")
+    div.empty-search-results(ng-class="{'hidden': issues.length}")
+        include ../components/empty-search-results
 
 
 script(type="text/ng-template", id="search-userstories")
@@ -42,10 +40,8 @@ script(type="text/ng-template", id="search-userstories")
                 div.status(tg-listitem-us-status="us")
                 div.points(tg-bo-bind="us.total_points")
 
-    div.empty.empty-search-results(ng-class="{'hidden': userstories.length}")
-                span.icon.icon-issues
-                span.title(translate="SEARCH.EMPTY_TITLE")
-                span(translate="SEARCH.EMPTY_DESCRIPTION")
+    div.empty-search-results(ng-class="{'hidden': userstories.length}")
+        include ../components/empty-search-results
 
 script(type="text/ng-template", id="search-tasks")
     div.search-result-table-container(ng-class="{'hidden': !tasks.length}", tg-bind-scope)
@@ -65,10 +61,8 @@ script(type="text/ng-template", id="search-tasks")
                 div.status(tg-listitem-task-status="task")
                 div.assigned-to(tg-listitem-assignedto="task")
 
-    div.empty.empty-search-results(ng-class="{'hidden': tasks.length}")
-                span.icon.icon-issues
-                span.title(translate="SEARCH.EMPTY_TITLE")
-                span(translate="SEARCH.EMPTY_DESCRIPTION")
+    div.empty-search-results(ng-class="{'hidden': tasks.length}")
+        include ../components/empty-search-results
 
 script(type="text/ng-template", id="search-wikipages")
     div.search-result-table-container(ng-class="{'hidden': !wikipages.length}", tg-bind-scope)
@@ -82,7 +76,5 @@ script(type="text/ng-template", id="search-wikipages")
                         a(href="", tg-nav="project-wiki-page:project=project.slug,slug=wikipage.slug",
                             tg-bo-bind="wikipage.slug")
 
-    div.empty.empty-search-results(ng-class="{'hidden': wikipages.length}")
-                span.icon.icon-issues
-                span.title(translate="SEARCH.EMPTY_TITLE")
-                span(translate="SEARCH.EMPTY_DESCRIPTION")
+    div.empty-search-results(ng-class="{'hidden': wikipages.length}")
+        include ../components/empty-search-results
diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss
index 04f34949..65371e7a 100644
--- a/app/styles/modules/search/search-result-table.scss
+++ b/app/styles/modules/search/search-result-table.scss
@@ -1,9 +1,4 @@
 .search-result-table {
-    .empty {
-        .title {
-            border: 0;
-        }
-    }
     .row {
         align-content: center;
         align-items: center;
@@ -63,14 +58,6 @@
             }
         }
     }
-    .title {
-        @extend %medium;
-        @extend %bold;
-        border-bottom: 1px solid $gray-light;
-        &:hover {
-            background: transparent;
-        }
-    }
     .table-main {
         @extend %small;
         border-bottom: 1px solid $whitish;
@@ -95,3 +82,19 @@
         }
     }
 }
+
+.empty-search-results {
+    margin-top: 4rem;
+    text-align: center;
+    img {
+        margin-bottom: 1rem;
+    }
+    .title {
+        @extend %large;
+        text-transform: uppercase;
+    }
+    p {
+        @extend %light;
+        margin: 0;
+    }
+}