diff --git a/app/scripts/_app.js b/app/scripts/_app.js
index 0f451bcdfc..f57596807a 100644
--- a/app/scripts/_app.js
+++ b/app/scripts/_app.js
@@ -76,9 +76,13 @@
     $mdThemingProvider.alwaysWatchTheme(true);
   }
 
-  function initGlobalModels(LS_DEFAULTS, DEFAULT_THEME, $rootScope, Tasks, $localStorage, Projects) {
+  function initGlobalModels(LS_DEFAULTS, DEFAULT_THEME, $rootScope, Tasks, $localStorage, Projects, $state) {
     $localStorage.$default(LS_DEFAULTS);
 
+    // we don't use r.$state because it looks more like something special
+    // this way
+    $rootScope.$state = $state;
+
     $rootScope.r = {};
 
     $rootScope.r.projects = Projects.getList();
diff --git a/app/scripts/daily-planner/daily-planner-d.html b/app/scripts/daily-planner/daily-planner-d.html
index f1147eb8ae..dcb984aeed 100644
--- a/app/scripts/daily-planner/daily-planner-d.html
+++ b/app/scripts/daily-planner/daily-planner-d.html
@@ -26,7 +26,9 @@
        layout-sm="column"
        layout-align="center center">
     <md-button class="md-raised md-primary"
-               ng-click="vm.done()">All done! Let's get to work!
+               ng-click="vm.done()">
+      <ng-md-icon icon="playlist_play"></ng-md-icon>
+      All done! Let's get to work!
     </md-button>
   </div>
 
@@ -54,11 +56,15 @@
 
   <md-button class="md-primary"
              ng-click="vm.limitBacklogTo = false"
-             ng-hide="vm.limitBacklogTo === false || r.backlogTasks.length <=vm.limitBacklogTo ||r.backlogTasks.length ===0">Show All {{ r.backlogTasks.length }} items in Backlog
+             ng-hide="vm.limitBacklogTo === false || r.backlogTasks.length <=vm.limitBacklogTo ||r.backlogTasks.length ===0">
+    <ng-md-icon icon="remove_red_eye"></ng-md-icon>
+    Show All {{ r.backlogTasks.length }} items in Backlog
   </md-button>
 
   <md-button class="md-primary"
-             ui-sref="done-tasks-backlog">Go To Done Backlog
+             ui-sref="done-tasks-backlog">
+    <ng-md-icon icon="list"></ng-md-icon>
+    Go To Done Backlog
   </md-button>
 </div>
 
diff --git a/app/scripts/daily-summary/daily-summary-d.html b/app/scripts/daily-summary/daily-summary-d.html
index e563c93839..65680ff4bd 100644
--- a/app/scripts/daily-summary/daily-summary-d.html
+++ b/app/scripts/daily-summary/daily-summary-d.html
@@ -1,4 +1,18 @@
+<div layout="row"
+     layout-sm="column"
+     layout-align="center center">
+  <md-button class="md-raised md-primary"
+             aria-label="Work View"
+             ui-sref="work-view">
+    <md-tooltip md-direction="bottom">
+      Go back to work view
+    </md-tooltip>
+    <ng-md-icon icon="playlist_play"></ng-md-icon>
+    Wait I forgot something!
+  </md-button>
+</div>
 <h1 class="md-headline">You're done for today! Take a moment to celebrate!</h1>
+
 <p>Tasks completed: <strong>{{vm.doneTasks.length}}/{{ r.tasks.length }}</strong></p>
 <p>Total time spent total on todays task: <strong>{{ vm.totalTimeSpentTasks|duration }}</strong></p>
 <p>Total time spent today: <strong>{{ vm.totalTimeSpentToday|duration }}</strong></p>
@@ -32,7 +46,9 @@
   </tr>
 </table>
 <md-button class="md-raised md-primary"
-           ng-click="vm.showExportModal()">Export Simple Task List for today
+           ng-click="vm.showExportModal()">
+  <ng-md-icon icon="call_made"></ng-md-icon>
+  Export Simple Task List for today
 </md-button>
 
 
@@ -85,5 +101,7 @@
 
 
 <md-button class="md-raised md-primary"
-           ng-click="vm.finishDay()">Clear done tasks, save and go home
-</md-button>
\ No newline at end of file
+           ng-click="vm.finishDay()">
+  <ng-md-icon icon="wb_sunny"></ng-md-icon>
+  Clear done tasks, save and go home
+</md-button>
diff --git a/app/scripts/main-header/main-header-d.html b/app/scripts/main-header/main-header-d.html
index 1e08d360ba..6262172c85 100644
--- a/app/scripts/main-header/main-header-d.html
+++ b/app/scripts/main-header/main-header-d.html
@@ -1,4 +1,4 @@
-<md-toolbar>
+<md-toolbar md-whiteframe="3">
   <div class="md-toolbar-tools">
     <md-button class="md-icon-button"
                aria-label="Home"
@@ -72,6 +72,7 @@
     <md-button class="md-icon-button"
                aria-label="Work View"
                ui-sref-active="md-raised"
+               ng-if="$state.current.name!=='daily-summary'"
                ui-sref="work-view">
       <md-tooltip md-direction="bottom">
         Go to work view
@@ -81,6 +82,7 @@
 
     <md-button class="md-icon-button"
                aria-label="Daily Summary"
+               ng-if="$state.current.name==='daily-summary'"
                ui-sref-active="md-raised"
                ui-sref="daily-summary">
       <md-tooltip md-direction="bottom">
diff --git a/app/scripts/work-view/work-view-d.html b/app/scripts/work-view/work-view-d.html
index 888309395d..45603d4029 100644
--- a/app/scripts/work-view/work-view-d.html
+++ b/app/scripts/work-view/work-view-d.html
@@ -12,6 +12,20 @@
              allow-task-selection="true"></task-list>
 </div>
 
+<md-button ng-click="vm.openAddTask()"
+           class="md-primary md-raised">
+  <ng-md-icon icon="add"></ng-md-icon>
+  Add new Task
+</md-button>
+
+
+<md-button ui-sref="daily-summary"
+           class="md-primary md-raised">
+  <ng-md-icon icon="done_all"></ng-md-icon>
+  Finish your work day
+</md-button>
+
+
 <h2 class="md-title">Done Tasks</h2>
 
 <div class="work-view-tasks work-view-tasks--done">
@@ -21,11 +35,4 @@
              current-task="r.currentTask"></task-list>
 </div>
 
-<md-button ng-click="vm.openAddTask()"
-           class="md-primary md-raised">Add new Task
-</md-button>
 
-
-<md-button ui-sref="daily-summary"
-           class="md-primary md-raised">Finish your work day
-</md-button>