diff --git a/app/partials/backlog.jade b/app/partials/backlog.jade
index 48028112..93f5609c 100644
--- a/app/partials/backlog.jade
+++ b/app/partials/backlog.jade
@@ -26,14 +26,12 @@ block content
                     span.icon.icon-tag
                     span.text Show Tags
                 include views/components/addnewus
-            section.backlog-table(ng-class="{'empty': !visibleUserstories.length}")
-
-                div.empty-container(ng-show="!visibleUserstories.length")
-                    span.icon.icon-idea
-                    span Your backlog is empty.
-                    a(href="", title+"Create a new US", ng-click="ctrl.addNewUs('standard')",
-                        tg-check-permission="tg-check-permission", permission="add_us") Create a new User Story
+            section.backlog-table(ng-class="{'hidden': !visibleUserstories.length}")
                 include views/modules/backlog-table
+            div.empty.empty-backlog(ng-class="{'hidden': visibleUserstories.length}")
+                span.icon.icon-idea
+                span Your backlog is empty.
+                a(href="", title+"Create a new US", ng-click="ctrl.addNewUs('standard')", tg-check-permission="tg-check-permission", permission="add_us") Create a new User Story
         sidebar.menu-secondary.sidebar
             include views/modules/sprints
     div.lightbox.lightbox_add-new-us(tg-lb-create-edit-userstory)
diff --git a/app/partials/views/modules/issues-table.jade b/app/partials/views/modules/issues-table.jade
index 9d991d8d..d0f49d37 100644
--- a/app/partials/views/modules/issues-table.jade
+++ b/app/partials/views/modules/issues-table.jade
@@ -19,6 +19,6 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}")
 
 section.empty.empty-issues(ng-class="{hidden: issues.length}")
     span.icon.icon-issues
-    span Cool! Your project is out of issues!
+    span.title There are no issues to report :-)
     span Did you find an issue?
     a(href="", title+"Create a new US", ng-click="ctrl.addNewIssue()") Create a new Issue
diff --git a/app/styles/layout/backlog.scss b/app/styles/layout/backlog.scss
index 18ec65d1..4756cec2 100644
--- a/app/styles/layout/backlog.scss
+++ b/app/styles/layout/backlog.scss
@@ -3,26 +3,18 @@
         float: right;
     }
 }
-.backlog-table {
-    &.empty {
-        border: 1px dashed $gray-light;
-        min-height: 10rem;
-        .backlog-table-header,
-        .backlog-table-body {
-            display: none;
-        }
-        .empty-container {
-            color: $gray-light;
-            padding: 5% 0;
-            text-align: center;
-        }
-        .icon {
-            @extend %xxlarge;
-            margin-bottom: 2rem;
-        }
-        span {
-            display: block;
-        }
+.empty-backlog {
+    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;
     }
 }
 
diff --git a/app/styles/modules/issues/issues-table.scss b/app/styles/modules/issues/issues-table.scss
index 8c12e7d4..2a7a08dc 100644
--- a/app/styles/modules/issues/issues-table.scss
+++ b/app/styles/modules/issues/issues-table.scss
@@ -10,8 +10,11 @@
     }
     span {
         display: block;
-        &:nth-child(2) {
+        &.title {
+            @extend %xlarge;
+            @extend %title;
             margin-bottom: 1rem;
+            text-transform: uppercase;
         }
     }
 }