diff --git a/app/modules/components/joy-ride/joy-ride.directive.coffee b/app/modules/components/joy-ride/joy-ride.directive.coffee
index 9464aad0..61a7c794 100644
--- a/app/modules/components/joy-ride/joy-ride.directive.coffee
+++ b/app/modules/components/joy-ride/joy-ride.directive.coffee
@@ -8,6 +8,7 @@ JoyRideDirective = ($rootScope, currentUserService, joyRideService) ->
         intro.setOptions({
             exitOnEsc: false,
             exitOnOverlayClick: false,
+            showStepNumbers: false,
             nextLabel: 'Next →',
             prevLabel: '← Back',
             skipLabel: 'Skip',
diff --git a/app/modules/components/joy-ride/joy-ride.service.coffee b/app/modules/components/joy-ride/joy-ride.service.coffee
index 1ad76541..68258123 100644
--- a/app/modules/components/joy-ride/joy-ride.service.coffee
+++ b/app/modules/components/joy-ride/joy-ride.service.coffee
@@ -10,7 +10,7 @@ joyRides = {
                 }
             },
             {
-                element: '.working-on-title',
+                element: '.working-on-container',
                 position: 'right',
                 joyride: {
                     title: @translate.instant('JOYRIDE.DASHBOARD.STEP2.TITLE'),
@@ -18,7 +18,7 @@ joyRides = {
                 }
             },
             {
-                element: '.watching-title',
+                element: '.watching-container',
                 position: 'right',
                 joyride: {
                     title: @translate.instant('JOYRIDE.DASHBOARD.STEP3.TITLE')
@@ -30,7 +30,7 @@ joyRides = {
             },
             {
                 element: '.project-list .see-more-projects-btn',
-                position: 'button',
+                position: 'bottom',
                 joyride: {
                     title: @translate.instant('JOYRIDE.DASHBOARD.STEP4.TITLE')
                     text: [
@@ -45,7 +45,7 @@ joyRides = {
         return [
             {
                 element: '.summary',
-                position: 'button',
+                position: 'bottom',
                 joyride: {
                     title: @translate.instant('JOYRIDE.BACKLOG.STEP1.TITLE')
                     text: [
@@ -55,8 +55,8 @@ joyRides = {
                 }
             },
             {
-                element: '.backlog-table',
-                position: 'right',
+                element: '.backlog-table-empty',
+                position: 'bottom',
                 joyride: {
                     title: @translate.instant('JOYRIDE.BACKLOG.STEP2.TITLE')
                     text: @translate.instant('JOYRIDE.BACKLOG.STEP2.TEXT')
@@ -74,8 +74,8 @@ joyRides = {
                 element: '.new-us',
                 position: 'rigth',
                 joyride: {
-                    title: @translate.instant('JOYRIDE.BACKLOG.STEP3.TITLE')
-                    text: @translate.instant('JOYRIDE.BACKLOG.STEP3.TEXT')
+                    title: @translate.instant('JOYRIDE.BACKLOG.STEP4.TITLE')
+                    text: @translate.instant('JOYRIDE.BACKLOG.STEP4.TEXT')
                 }
             }
         ]
@@ -91,7 +91,7 @@ joyRides = {
                 }
             },
             {
-                element: '.kanban-uses-box',
+                element: '.card-placeholder',
                 position: 'right',
                 joyride: {
                     title: @translate.instant('JOYRIDE.KANBAN.STEP2.TITLE')
@@ -99,7 +99,7 @@ joyRides = {
                 }
             },
             {
-                element: 'div[tg-kanban-squish-column] h2',
+                element: '.icon-plus',
                 position: 'bottom',
                 joyride: {
                     title: @translate.instant('JOYRIDE.KANBAN.STEP3.TITLE')
diff --git a/app/modules/home/working-on/working-on.jade b/app/modules/home/working-on/working-on.jade
index 4777e130..f12edae1 100644
--- a/app/modules/home/working-on/working-on.jade
+++ b/app/modules/home/working-on/working-on.jade
@@ -1,17 +1,19 @@
-div.title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION")
+section.working-on-container
+    .title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION")
 
-section.working-on(ng-show="vm.assignedTo.size")
-    div.duty-single(tg-duty="duty", tg-repeat="duty in vm.assignedTo", ng-class="{blocked: duty.is_blocked}")
+    .working-on(ng-show="vm.assignedTo.size")
+        .duty-single(tg-duty="duty", tg-repeat="duty in vm.assignedTo", ng-class="{blocked: duty.is_blocked}")
 
-section.working-on-empty(ng-show="!vm.assignedTo.size")
-    p(translate="HOME.EMPTY_WORKING_ON")
-    include empty.jade
+    .working-on-empty(ng-show="!vm.assignedTo.size")
+        p(translate="HOME.EMPTY_WORKING_ON")
+        include empty.jade
 
-div.title-bar.watching-title(translate="HOME.WATCHING_SECTION")
+section.watching-container
+    .title-bar.watching-title(translate="HOME.WATCHING_SECTION")
 
-section.watching(ng-show="vm.watching.size")
-    div.duty-single(tg-duty="duty", tg-repeat="duty in vm.watching", ng-class="{blocked: duty.is_blocked}")
+    .watching(ng-show="vm.watching.size")
+        .duty-single(tg-duty="duty", tg-repeat="duty in vm.watching", ng-class="{blocked: duty.is_blocked}")
 
-section.watching-empty(ng-show="!vm.watching.size")
-    p(translate="HOME.EMPTY_WATCHING")
-    include empty.jade
+    .watching-empty(ng-show="!vm.watching.size")
+        p(translate="HOME.EMPTY_WATCHING")
+        include empty.jade
diff --git a/app/styles/modules/help/joyride.scss b/app/styles/modules/help/joyride.scss
index 5a9d7763..c9938f01 100644
--- a/app/styles/modules/help/joyride.scss
+++ b/app/styles/modules/help/joyride.scss
@@ -1,4 +1,58 @@
+// scss-lint:disable SelectorFormat, QualifyingElement
+
 .introjs-overlay {
-    background: radial-gradient(center, ellipse cover, rgba($whitish, .4) 0, rgba($whitish, .9) 100%);
+    background: radial-gradient(center, ellipse cover, rgba($white, .2) 0, rgba($whitish, .2) 100%);
     background-color: $whitish;
 }
+.introjs-helperLayer {
+    border: 1px solid rgba($primary-light, .8);
+}
+
+.introjs-helperLayer,
+.introjs-tooltip {
+    box-shadow: 0 1px 8px rgba($grayer, .2);
+}
+
+.introjs-tooltip {
+    h3 {
+        @extend %large;
+        margin-bottom: .5rem;
+    }
+    p {
+        @extend %light;
+        line-height: 1.4;
+        margin-bottom: 0;
+    }
+}
+
+.introjs-bullets {
+    ul {
+        li {
+            a.active {
+                background: $primary-light;
+            }
+        }
+    }
+}
+
+.introjs-button {
+    background-color: $primary;
+    background-image: none;
+    border: 0;
+    border-radius: 0;
+    color: $white;
+    margin-top: 10px;
+    padding: .3rem .8rem;
+    text-shadow: none;
+    &:focus,
+    &:hover {
+        background: none;
+        background-color: $primary-light;
+        color: $white;
+    }
+    &.introjs-disabled {
+        background: $whitish;
+        background-color: none;
+        color: $white;
+    }
+}