=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dashboard.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dashboard.html	2014-05-21 15:55:51 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dashboard.html	2014-06-19 09:47:23 +0000
@@ -1,9 +1,19 @@
 <div class="container-1-1">    
     <div class="col-sm-12 vertical-spacing">        
         <button type="button" class="btn btn-default" ng-click="back()">{{'back'| translate}}</button>
-        <span class="right">
+        <div class="pull-right">
+            <div class="btn-group" dropdown is-open="status.isopen">
+                <button type="button" class="btn btn-default dropdown-toggle">
+                    <i class="fa fa-cog" title="{{'settings' | translate}}"></i>
+                </button>
+                <ul class="dropdown-menu pull-right" role="menu">
+                    <li><a href ng-click="showHideWidgets()">{{'show_hide_widgets'| translate}}</a></li>
+                </ul>
+            </div>
+        </div>
+        <!--<span class="right">
             <button type="button" class="btn btn-default" ng-click="showHideWidgets()">{{'show_hide_widgets'| translate}}</button>
-        </span>        
+        </span> -->       
     </div>
 
     <div class='separator'></div>

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-06-19 09:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-06-19 09:47:23 +0000
@@ -22,7 +22,7 @@
             <div class="pull-right">
                 <div class="btn-group" dropdown is-open="status.isopen">
                     <button type="button" class="btn btn-default dropdown-toggle" ng-disabled="trackedEntityList.rows.length <=0 ">
-                        <i class="fa fa-cog"></i>
+                        <i class="fa fa-cog" title="{{'settings' | translate}}"></i>
                     </button>
                     <ul class="dropdown-menu pull-right" role="menu">
                         <li ng-show="trackedEntityList.rows.length > 0"><a href ng-click="showHideColumns()">{{'show_hide_columns'| translate}}</a></li>