diff --git a/app/partials/views/modules/search-result-table.jade b/app/partials/views/modules/search-result-table.jade
index bc986a68..951554e7 100644
--- a/app/partials/views/modules/search-result-table.jade
+++ b/app/partials/views/modules/search-result-table.jade
@@ -1,57 +1,83 @@
 section.search-result-table
 
 script(type="text/ng-template", id="search-issues")
-    div.search-result-table-header
-        div.row.title
-            div.user-stories.width-4 Issues
-            div.status.width-2 Status
-            div.points.width-1 Assigned to
-    div.search-result-table-body
-        div.row.table-main(ng-repeat="issue in issues track by issue.id")
-            div.user-stories.width-6
-                div.user-story-name
-                    a(href="", tg-nav="project-issues-detail:project=project.slug,ref=issue.ref",
-                      tg-bo-bind="issue.subject")
-            div.status.width-2(tg-listitem-issue-status="issue")
-            div.points.width-1(tg-listitem-assignedto="issue")
+    div.search-result-table-container(ng-class="{'hidden': !issues.length}")
+        div.search-result-table-header
+            div.row.title
+                div.user-stories.width-4 Issues
+                div.status.width-2 Status
+                div.points.width-1 Assigned to
+        div.search-result-table-body
+            div.row.table-main(ng-repeat="issue in issues track by issue.id")
+                div.user-stories.width-6
+                    div.user-story-name
+                        a(href="", tg-nav="project-issues-detail:project=project.slug,ref=issue.ref",
+                          tg-bo-bind="issue.subject")
+                div.status.width-2(tg-listitem-issue-status="issue")
+                div.points.width-1(tg-listitem-assignedto="issue")
+
+    div.empty.empty-search-results(ng-class="{'hidden': issues.length}")
+                span.icon.icon-issues
+                span.title It looks like nothing was found with your search criteria.
+                span Maybe try one of the tabs above or search again
+
 
 script(type="text/ng-template", id="search-userstories")
-    div.search-result-table-header
-        div.row.title
-            div.user-stories.width-4 User Stories
-            div.status.width-2 Status
-            div.points.width-1 Points
-    div.search-result-table-body
-        div.row.table-main(ng-repeat="us in userstories track by us.id")
-            div.user-stories.width-4
-                div.user-story-name
-                    a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref",
-                        tg-bo-bind="us.subject")
-            div.status.width-2(tg-listitem-us-status="us")
-            div.points.width-1(tg-bo-bind="us.total_points")
+    div.search-result-table-container(ng-class="{'hidden': !userstories.length}")
+        div.search-result-table-header
+            div.row.title
+                div.user-stories.width-4 User Stories
+                div.status.width-2 Status
+                div.points.width-1 Points
+        div.search-result-table-body
+            div.row.table-main(ng-repeat="us in userstories track by us.id")
+                div.user-stories.width-4
+                    div.user-story-name
+                        a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref",
+                            tg-bo-bind="us.subject")
+                div.status.width-2(tg-listitem-us-status="us")
+                div.points.width-1(tg-bo-bind="us.total_points")
+
+    div.empty.empty-search-results(ng-class="{'hidden': userstories.length}")
+                span.icon.icon-issues
+                span.title It looks like nothing was found with your search criteria.
+                span Maybe try one of the tabs above or search again
 
 script(type="text/ng-template", id="search-tasks")
-    div.search-result-table-header
-        div.row.title
-            div.user-stories.width-4 Task
-            div.status.width-2 Status
-            div.points.width-1 Assigned to
-    div.search-result-table-body
-        div.row.table-main(ng-repeat="task in tasks track by task.id")
-            div.user-stories.width-4
-                div.user-story-name
-                    a(href="", tg-nav="project-tasks-detail:project=project.slug,ref=task.ref",
-                        tg-bo-bind="task.subject")
-            div.status.width-2(tg-listitem-task-status="task")
-            div.points.width-1(tg-listitem-assignedto="task")
+    div.search-result-table-container(ng-class="{'hidden': !tasks.length}")
+        div.search-result-table-header
+            div.row.title
+                div.user-stories.width-4 Task
+                div.status.width-2 Status
+                div.points.width-1 Assigned to
+        div.search-result-table-body
+            div.row.table-main(ng-repeat="task in tasks track by task.id")
+                div.user-stories.width-4
+                    div.user-story-name
+                        a(href="", tg-nav="project-tasks-detail:project=project.slug,ref=task.ref",
+                            tg-bo-bind="task.subject")
+                div.status.width-2(tg-listitem-task-status="task")
+                div.points.width-1(tg-listitem-assignedto="task")
+
+    div.empty.empty-search-results(ng-class="{'hidden': tasks.length}")
+                span.icon.icon-issues
+                span.title It looks like nothing was found with your search criteria.
+                span Maybe try one of the tabs above or search again
 
 script(type="text/ng-template", id="search-wikipages")
-    div.search-result-table-header
-        div.row.title
-            div.user-stories.width-4 Wiki page
-    div.search-result-table-body
-        div.row.table-main(ng-repeat="wikipage in wikipages track by wikipage.id")
-            div.user-stories.width-4
-                div.user-story-name
-                    a(href="", tg-nav="project-wiki-page:project=project.slug,slug=wikipage.slug",
-                        tg-bo-bind="wikipage.slug")
+    div.search-result-table-container(ng-class="{'hidden': !wikipages.length}")
+        div.search-result-table-header
+            div.row.title
+                div.user-stories.width-4 Wiki page
+        div.search-result-table-body
+            div.row.table-main(ng-repeat="wikipage in wikipages track by wikipage.id")
+                div.user-stories.width-4
+                    div.user-story-name
+                        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 It looks like nothing was found with your search criteria.
+                span Maybe try one of the tabs above or search again
+
diff --git a/app/styles/modules/search/search-in.scss b/app/styles/modules/search/search-in.scss
index c035755a..d66fdcf3 100644
--- a/app/styles/modules/search/search-in.scss
+++ b/app/styles/modules/search/search-in.scss
@@ -1,7 +1,15 @@
 .search-in {
-    .icon {
+    input {
+        background: $grayer;
+        color: $white;
+        @include placeholder {
+            color: $gray-light;
+        }
+    }
+    .icon-search {
+        color: $gray-light;
         position: absolute;
-        right: 10px;
-        top: 6px;
+        right: .7rem;
+        top: .7rem;
     }
 }
diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss
index 7ca225e3..8675d43f 100644
--- a/app/styles/modules/search/search-result-table.scss
+++ b/app/styles/modules/search/search-result-table.scss
@@ -1,5 +1,11 @@
 .search-result-table {
 
+    .empty {
+        .title {
+            border: 0;
+        }
+    }
+
     .row {
         @include table-flex;
         padding: 20px;