diff --git a/app/images/backlog-empty.png b/app/images/backlog-empty.png
deleted file mode 100644
index a7179c86..00000000
Binary files a/app/images/backlog-empty.png and /dev/null differ
diff --git a/app/images/empty/empty_contact.png b/app/images/empty/empty_contact.png
new file mode 100644
index 00000000..2868e3bb
Binary files /dev/null and b/app/images/empty/empty_contact.png differ
diff --git a/app/images/empty/empty_des.png b/app/images/empty/empty_des.png
new file mode 100644
index 00000000..7600162b
Binary files /dev/null and b/app/images/empty/empty_des.png differ
diff --git a/app/images/empty/empty_field.png b/app/images/empty/empty_field.png
new file mode 100644
index 00000000..ba627ce7
Binary files /dev/null and b/app/images/empty/empty_field.png differ
diff --git a/app/images/empty/empty_like.png b/app/images/empty/empty_like.png
new file mode 100644
index 00000000..4d0e7967
Binary files /dev/null and b/app/images/empty/empty_like.png differ
diff --git a/app/images/empty/empty_mex.png b/app/images/empty/empty_mex.png
new file mode 100644
index 00000000..1800ee7c
Binary files /dev/null and b/app/images/empty/empty_mex.png differ
diff --git a/app/images/empty/empty_moon.png b/app/images/empty/empty_moon.png
new file mode 100644
index 00000000..376f7510
Binary files /dev/null and b/app/images/empty/empty_moon.png differ
diff --git a/app/images/empty/empty_sprint.png b/app/images/empty/empty_sprint.png
new file mode 100644
index 00000000..808e0663
Binary files /dev/null and b/app/images/empty/empty_sprint.png differ
diff --git a/app/images/empty/empty_tex.png b/app/images/empty/empty_tex.png
new file mode 100644
index 00000000..02330ecb
Binary files /dev/null and b/app/images/empty/empty_tex.png differ
diff --git a/app/images/empty/empty_upvote.png b/app/images/empty/empty_upvote.png
new file mode 100644
index 00000000..fbd66f24
Binary files /dev/null and b/app/images/empty/empty_upvote.png differ
diff --git a/app/images/empty/empty_watch.png b/app/images/empty/empty_watch.png
new file mode 100644
index 00000000..e69c543a
Binary files /dev/null and b/app/images/empty/empty_watch.png differ
diff --git a/app/images/issues-empty.png b/app/images/issues-empty.png
deleted file mode 100644
index 4668e027..00000000
Binary files a/app/images/issues-empty.png and /dev/null differ
diff --git a/app/images/search-empty.png b/app/images/search-empty.png
deleted file mode 100644
index d95477dc..00000000
Binary files a/app/images/search-empty.png and /dev/null differ
diff --git a/app/images/sprint-empty.png b/app/images/sprint-empty.png
deleted file mode 100644
index e51329a4..00000000
Binary files a/app/images/sprint-empty.png and /dev/null differ
diff --git a/app/modules/discover/discover-search/discover-search.jade b/app/modules/discover/discover-search/discover-search.jade
index 1290ab83..d605246c 100644
--- a/app/modules/discover/discover-search/discover-search.jade
+++ b/app/modules/discover/discover-search/discover-search.jade
@@ -6,9 +6,9 @@ div(tg-discover-search)
             on-change="vm.onChangeFilter(filter, q)"
         )
 
-    .empty-discover-results(ng-if="!vm.searchResult.size && !vm.loadingGlobal && !vm.loadingList")
+    .empty-large(ng-if="!vm.searchResult.size && !vm.loadingGlobal && !vm.loadingList")
         img(
-            src="/#{v}/images/issues-empty.png",
+            src="/#{v}/images/empty_tex.png",
             alt="{{ DISCOVER.EMPTY | translate }}"
         )
         p.title(translate="DISCOVER.EMPTY")
diff --git a/app/modules/profile/profile-contacts/profile-contacts.jade b/app/modules/profile/profile-contacts/profile-contacts.jade
index 5f8d2ef6..16c7d71e 100644
--- a/app/modules/profile/profile-contacts/profile-contacts.jade
+++ b/app/modules/profile/profile-contacts/profile-contacts.jade
@@ -3,8 +3,11 @@ section.profile-contacts
         div.spin
             img(src="/#{v}/svg/spinner-circle.svg", alt="Loading...")
 
-    div.empty-tab(ng-if="vm.contacts && !vm.contacts.size")
-        tg-svg(svg-icon="icon-unwatch")
+    div.empty-small(ng-if="vm.contacts && !vm.contacts.size")
+        img(
+            src="/#{v}/images/empty/empty_contact.png"
+            alt="{{ 'USER.PROFILE.CONTACTS_EMPTY' | translate }}"
+        )
 
         div(ng-if="!vm.isCurrentUser")
             p(translate="USER.PROFILE.CONTACTS_EMPTY", translate-values="{username: vm.user.get('full_name_display')}")
diff --git a/app/modules/profile/profile-favs/profile-favs.controller.coffee b/app/modules/profile/profile-favs/profile-favs.controller.coffee
index 5bd5917d..f47f7823 100644
--- a/app/modules/profile/profile-favs/profile-favs.controller.coffee
+++ b/app/modules/profile/profile-favs/profile-favs.controller.coffee
@@ -131,6 +131,7 @@ class ProfileLikedController extends FavsBaseController
 
     constructor: (@userService) ->
         super()
+        @.tabName = 'likes'
         @.enableFilterByAll = false
         @.enableFilterByProjects = false
         @.enableFilterByUserStories = false
@@ -154,6 +155,7 @@ class ProfileVotedController extends FavsBaseController
 
     constructor: (@userService) ->
         super()
+        @.tabName = 'upvotes'
         @.enableFilterByAll = true
         @.enableFilterByProjects = false
         @.enableFilterByUserStories = true
@@ -179,6 +181,7 @@ class ProfileWatchedController extends FavsBaseController
 
     constructor: (@userService) ->
         super()
+        @.tabName = 'watchers'
         @._getItems = @userService.getWatched
 
 
diff --git a/app/modules/profile/profile-favs/profile-favs.jade b/app/modules/profile/profile-favs/profile-favs.jade
index 880c25e6..0317836b 100644
--- a/app/modules/profile/profile-favs/profile-favs.jade
+++ b/app/modules/profile/profile-favs/profile-favs.jade
@@ -87,9 +87,20 @@ section.profile-favs
                 alt="{{ 'COMMON.LOADING'|translate }}"
             )
 
-    .empty-search-results(ng-if="vm.hasNoResults && !vm.isLoading")
+    .empty-small(ng-if="vm.hasNoResults && !vm.isLoading")
         img(
-            src="/#{v}/images/search-empty.png"
+            ng-if="vm.tabName === 'likes'"
+            src="/#{v}/images/empty/empty_like.png"
+            alt="{{ 'USER.PROFILE_FAVS.EMPTY_TITLE' | translate }}"
+        )
+        img(
+            ng-if="vm.tabName === 'upvotes'"
+            src="/#{v}/images/empty/empty_upvote.png"
+            alt="{{ 'USER.PROFILE_FAVS.EMPTY_TITLE' | translate }}"
+        )
+        img(
+            ng-if="vm.tabName === 'watchers'"
+            src="/#{v}/images/empty/empty_watch.png"
             alt="{{ 'USER.PROFILE_FAVS.EMPTY_TITLE' | translate }}"
         )
         p.title {{ 'USER.PROFILE_FAVS.EMPTY_TITLE' | translate }}
diff --git a/app/modules/profile/profile.jade b/app/modules/profile/profile.jade
index 3b6caf8e..79ba4add 100644
--- a/app/modules/profile/profile.jade
+++ b/app/modules/profile/profile.jade
@@ -1,7 +1,10 @@
 div.profile.centered(ng-if="vm.user")
-    div(tg-profile-bar, user="vm.user", isCurrentUser="vm.isCurrentUser")
+    tg-profile-bar(
+        user="vm.user"
+        isCurrentUser="vm.isCurrentUser"
+    )
     div.main
-        div.timeline-wrapper(tg-profile-tabs)
+        tg-profile-tabs.timeline-wrapper
             div(
                 tg-profile-tab="{{'USER.PROFILE.TABS.ACTIVITY_TAB' | translate}}"
                 tab-title="{{'USER.PROFILE.TABS.ACTIVITY_TAB_TITLE' | translate}}"
diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade
index 5faa48b1..69330b95 100644
--- a/app/partials/backlog/backlog.jade
+++ b/app/partials/backlog/backlog.jade
@@ -78,9 +78,9 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
         section.backlog-table(ng-class="{'hidden': !userstories.length}")
             include ../includes/modules/backlog-table
 
-        div.empty-backlog(ng-class="{'hidden': userstories === undefined || userstories.length}")
+        div.empty-large(ng-class="{'hidden': userstories === undefined || userstories.length}")
             img(
-                src="/#{v}/images/backlog-empty.png"
+                src="/#{v}/images/empty/empty_mex.png"
                 alt="{{'BACKLOG.EMPTY' | translate}}"
             )
             p.title(translate="BACKLOG.EMPTY")
diff --git a/app/partials/includes/components/empty-search-results.jade b/app/partials/includes/components/empty-search-results.jade
index f3248bd3..47634e21 100644
--- a/app/partials/includes/components/empty-search-results.jade
+++ b/app/partials/includes/components/empty-search-results.jade
@@ -1,5 +1,5 @@
 img(
-    src="/#{v}/images/search-empty.png"
+    src="/#{v}/images/empty/empty_tex.png"
     alt="{{ 'SEARCH.EMPTY_TITLE' | translate }}"
 )
 p.title {{ 'SEARCH.EMPTY_TITLE' | translate }}
diff --git a/app/partials/includes/modules/issues-table.jade b/app/partials/includes/modules/issues-table.jade
index 186629c8..c1a5fcfe 100644
--- a/app/partials/includes/modules/issues-table.jade
+++ b/app/partials/includes/modules/issues-table.jade
@@ -80,9 +80,9 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}")
                     svg-icon="icon-arrow-down"
                 )
 
-section.empty-issues(ng-if="issues != undefined && issues.length == 0")
+section.empty-large(ng-if="issues != undefined && issues.length == 0")
     img(
-        src="/#{v}/images/issues-empty.png",
+        src="/#{v}/images/empty/empty_moon.png",
         alt="{{ISSUES.TABLE.EMPTY.TITLE | translate }}"
     )
     p.title(translate="ISSUES.TABLE.EMPTY.TITLE")
diff --git a/app/partials/includes/modules/search-result-table.jade b/app/partials/includes/modules/search-result-table.jade
index f6550aa5..4b5df259 100644
--- a/app/partials/includes/modules/search-result-table.jade
+++ b/app/partials/includes/modules/search-result-table.jade
@@ -18,7 +18,7 @@ script(type="text/ng-template", id="search-issues")
                 div.status(tg-listitem-issue-status="issue")
                 div.assigned-to(tg-listitem-assignedto="issue")
 
-    div.empty-search-results(ng-class="{'hidden': issues.length}")
+    div.empty-large(ng-class="{'hidden': issues.length}")
         include ../components/empty-search-results
 
 
@@ -45,7 +45,7 @@ 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-search-results(ng-class="{'hidden': userstories.length}")
+    div.empty-large(ng-class="{'hidden': userstories.length}")
         include ../components/empty-search-results
 
 script(type="text/ng-template", id="search-tasks")
@@ -66,7 +66,7 @@ script(type="text/ng-template", id="search-tasks")
                 div.status(tg-listitem-task-status="task")
                 div.assigned-to(tg-listitem-assignedto="task")
 
-    div.empty-search-results(ng-class="{'hidden': tasks.length}")
+    div.empty-large(ng-class="{'hidden': tasks.length}")
         include ../components/empty-search-results
 
 script(type="text/ng-template", id="search-wikipages")
@@ -81,5 +81,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-search-results(ng-class="{'hidden': wikipages.length}")
+    div.empty-large(ng-class="{'hidden': wikipages.length}")
         include ../components/empty-search-results
diff --git a/app/partials/includes/modules/sprints.jade b/app/partials/includes/modules/sprints.jade
index 0b52dd40..8c0b856b 100644
--- a/app/partials/includes/modules/sprints.jade
+++ b/app/partials/includes/modules/sprints.jade
@@ -15,9 +15,9 @@ section.sprints
         )
             tg-svg(svg-icon="icon-add")
 
-    div.sprints-empty(ng-if="totalMilestones === 0")
+    div.empty-small(ng-if="totalMilestones === 0")
         img(
-            src="/#{v}/images/sprint-empty.png"
+            src="/#{v}/images/empty/empty_sprint.png"
             alt="{{'BACKLOG.SPRINTS.EMPTY' | translate}}"
         )
         p.title(translate="BACKLOG.SPRINTS.EMPTY")
diff --git a/app/styles/components/empty.scss b/app/styles/components/empty.scss
new file mode 100644
index 00000000..23fe77c7
--- /dev/null
+++ b/app/styles/components/empty.scss
@@ -0,0 +1,34 @@
+%empty {
+    margin-top: 4rem;
+    text-align: center;
+    img {
+        margin-bottom: 1rem;
+        width: 100%;
+    }
+    .title {
+        @include font-size(large);
+        text-transform: uppercase;
+    }
+    p {
+        @include font-type(light);
+        margin: 0;
+    }
+    a {
+        @include font-type(light);
+        color: $primary;
+    }
+}
+
+.empty-small {
+    @extend %empty;
+    img {
+        max-width: 175px;
+    }
+}
+
+.empty-large {
+    @extend %empty;
+    img {
+        max-width: 800px;
+    }
+}
diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss
index 9a9d2b9e..99f22b12 100644
--- a/app/styles/modules/backlog/backlog-table.scss
+++ b/app/styles/modules/backlog/backlog-table.scss
@@ -284,23 +284,3 @@
         }
     }
 }
-
-.empty-backlog {
-    @include font-type(light);
-    padding: 2rem;
-    text-align: center;
-    .row {
-        display: none;
-    }
-    img {
-        margin-bottom: 1rem;
-    }
-    .title {
-        @include font-size(large);
-        margin-bottom: .5rem;
-        text-transform: uppercase;
-    }
-    a {
-        color: $primary;
-    }
-}
diff --git a/app/styles/modules/issues/issues-table.scss b/app/styles/modules/issues/issues-table.scss
index be04768d..2eddaf5b 100644
--- a/app/styles/modules/issues/issues-table.scss
+++ b/app/styles/modules/issues/issues-table.scss
@@ -175,19 +175,3 @@
         display: inline-block;
     }
 }
-
-.empty-issues {
-    margin-top: 4rem;
-    text-align: center;
-    img {
-        margin-bottom: 1rem;
-    }
-    .title {
-        @include font-size(large);
-        text-transform: uppercase;
-    }
-    p {
-        @include font-type(light);
-        margin: 0;
-    }
-}
diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss
index 79571ccd..0f9109e5 100644
--- a/app/styles/modules/search/search-result-table.scss
+++ b/app/styles/modules/search/search-result-table.scss
@@ -85,19 +85,3 @@
 .search-result-table-header {
     @include font-type(bold);
 }
-
-.empty-search-results {
-    margin-top: 4rem;
-    text-align: center;
-    img {
-        margin-bottom: 1rem;
-    }
-    .title {
-        @include font-size(large);
-        text-transform: uppercase;
-    }
-    p {
-        @include font-type(light);
-        margin: 0;
-    }
-}