diff --git a/app/images/backlog-empty.png b/app/images/backlog-empty.png
new file mode 100644
index 00000000..a7179c86
Binary files /dev/null and b/app/images/backlog-empty.png differ
diff --git a/app/images/sprint-empty.png b/app/images/sprint-empty.png
new file mode 100644
index 00000000..e51329a4
Binary files /dev/null and b/app/images/sprint-empty.png differ
diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade
index 701c35e0..11ebca9b 100644
--- a/app/partials/backlog/backlog.jade
+++ b/app/partials/backlog/backlog.jade
@@ -19,33 +19,41 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
 
         div.backlog-menu
             div.backlog-table-options
-                a.trans-button.move-to-current-sprint(href="",
-                                            title="{{'BACKLOG.MOVE_US_TO_CURRENT_SPRINT' | translate}}",
-                                            id="move-to-current-sprint")
+                a.trans-button.move-to-current-sprint(
+                    href=""
+                    title="{{'BACKLOG.MOVE_US_TO_CURRENT_SPRINT' | translate}}"
+                    id="move-to-current-sprint"
+                )
                     span.icon.icon-move
                     span.text(translate="BACKLOG.MOVE_US_TO_CURRENT_SPRINT")
-                a.trans-button(href="",
-                               title="{{'BACKLOG.FILTERS.TOGGLE' | translate}}",
-                               id="show-filters-button")
-                    span.icon.icon-filter
-                    span.text(translate="BACKLOG.FILTERS.SHOW")
-                a.trans-button(href="",
-                               title="{{'BACKLOG.TAGS.TOGGLE' | translate}}",
-                               id="show-tags")
-                    span.icon.icon-tag
-                    span.text(translate="BACKLOG.TAGS.SHOW")
+                a.trans-button(
+                    href=""
+                    title="{{'BACKLOG.FILTERS.TOGGLE' | translate}}"
+                    id="show-filters-button"
+                    translate="BACKLOG.FILTERS.SHOW"
+                )
+                a.trans-button(
+                    href=""
+                    title="{{'BACKLOG.TAGS.TOGGLE' | translate}}"
+                    id="show-tags"
+                    translate="BACKLOG.TAGS.SHOW"
+                )
             include ../includes/components/addnewus
 
         section.backlog-table(ng-class="{'hidden': !userstories.length}")
             include ../includes/modules/backlog-table
 
-        div.empty.empty-backlog(ng-class="{'hidden': userstories.length}", tg-backlog-empty-sortable)
-            span.icon.icon-backlog
-            span.title(translate="BACKLOG.EMPTY")
-            a(href="", title="{{'BACKLOG.CREATE_NEW_US' | translate}}",
-              ng-click="ctrl.addNewUs('standard')",
-              tg-check-permission="add_us",
-              translate="BACKLOG.CREATE_NEW_US_EMPTY_HELP")
+        div.empty-backlog(ng-class="{'hidden': userstories.length}", tg-backlog-empty-sortable)
+            img(
+                src="/images/backlog-empty.png"
+                alt="{{'BACKLOG.EMPTY' | translate}}"    
+            )
+            p.title(translate="BACKLOG.EMPTY")
+            a(href="", title="{{'BACKLOG.CREATE_NEW_US' | translate}}"
+                ng-click="ctrl.addNewUs('standard')"
+                tg-check-permission="add_us"
+                translate="BACKLOG.CREATE_NEW_US_EMPTY_HELP"
+            )
 
     sidebar.menu-secondary.sidebar
         include ../includes/modules/sprints
diff --git a/app/styles/core/elements.scss b/app/styles/core/elements.scss
index 9c42a1b8..2d50b9f1 100644
--- a/app/styles/core/elements.scss
+++ b/app/styles/core/elements.scss
@@ -79,26 +79,3 @@ sup {
         }
     }
 }
-
-
-//Empty
-.empty {
-    border: 1px dashed $gray-light;
-    color: $gray-light;
-    min-height: 10rem;
-    padding: 5% 0;
-    text-align: center;
-    .icon {
-        @extend %xxlarge;
-        margin-bottom: 2rem;
-    }
-    span {
-        display: block;
-        &.title {
-            @extend %xlarge;
-            @extend %title;
-            margin-bottom: 1rem;
-            text-transform: uppercase;
-        }
-    }
-}
diff --git a/app/styles/layout/backlog.scss b/app/styles/layout/backlog.scss
index 65941a74..b9fc2f38 100644
--- a/app/styles/layout/backlog.scss
+++ b/app/styles/layout/backlog.scss
@@ -4,16 +4,19 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 1rem;
-    padding: .5rem;
-    .trans-button {
-        display: inline-block;
-        margin-right: 1rem;
-        padding: .3rem 0;
-        &.move-to-current-sprint {
-            display: none;
-        }
-        span {
-            vertical-align: middle;
+    .backlog-table-options {
+        .trans-button {
+            @extend %trans-button;
+            color: $blackish;
+            display: inline-block;
+            padding: .4rem 1.5rem;
+            &:hover {
+                background: $gray-light;
+                color: $whitish;
+            }
+            &.move-to-current-sprint {
+                display: none;
+            }
         }
     }
     .button-bulk {
diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss
index 365ed4c7..c128124e 100644
--- a/app/styles/modules/backlog/backlog-table.scss
+++ b/app/styles/modules/backlog/backlog-table.scss
@@ -248,3 +248,20 @@
         padding-right: 45px;
     }
 }
+
+.empty-backlog {
+    @extend %light;
+    padding: 2rem;
+    text-align: center;
+    img {
+        margin-bottom: 1rem;
+    }
+    .title {
+        @extend %large;
+        margin-bottom: .5rem;
+        text-transform: uppercase;
+    }
+    a {
+        color: $primary;
+    }
+}
diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss
index db6ec827..04f34949 100644
--- a/app/styles/modules/search/search-result-table.scss
+++ b/app/styles/modules/search/search-result-table.scss
@@ -4,7 +4,6 @@
             border: 0;
         }
     }
-
     .row {
         align-content: center;
         align-items: center;