diff --git a/ChangeLog b/ChangeLog
index 25b013dcc..0345e020b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ New features:
 
 Improvements:
 
+* Move homepage menus to the user dropdown
 * Have a new task assigned to the creator by default instead of "no assignee"
 * Show progress for task links in board tooltips
 * Simplify code to handle ajax popover and redirects
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index c6005e78b..eafdfd0ba 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php
index 8d1532795..ef6150661 100644
--- a/app/Locale/cs_CZ/translations.php
+++ b/app/Locale/cs_CZ/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index c6a3d0998..6ac60df57 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 01defc76f..ac0fbb47c 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php
index 5e62b6edc..ffed12b8f 100644
--- a/app/Locale/el_GR/translations.php
+++ b/app/Locale/el_GR/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index 05f3ce1bc..9f9223910 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index 06eba55fe..84da392fa 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index c85ba6bae..ea5e901a6 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -1128,4 +1128,9 @@ return array(
     'There is no internal link for the moment.' => 'Il n\'y a pas de lien interne pour le moment.',
     'Assign to me' => 'Assigner à moi',
     'Me' => 'Moi',
+    'Do not duplicate anything' => 'Ne rien dupliquer',
+    'Projects management' => 'Gestion des projets',
+    'Users management' => 'Gestion des utilisateurs',
+    'Groups management' => 'Gestion des groupes',
+    'Create from another project' => 'Créer depuis un autre projet',
 );
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index ec8e7cd88..e3df67b46 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php
index ce51b4183..5eeb1492d 100644
--- a/app/Locale/id_ID/translations.php
+++ b/app/Locale/id_ID/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index 2ce440f25..9e96e4700 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 1a023b5a8..b95c960d0 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index c112f6c14..cbea7c166 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php
index d0fce9ecc..289804488 100644
--- a/app/Locale/nb_NO/translations.php
+++ b/app/Locale/nb_NO/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 2394d5058..4d2dd0eac 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 6122f7fd2..02c7d0665 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index e5f6c1523..91dde38d9 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index 9961a943f..e5406c179 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 9d1a0a7c5..6832a8f5d 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 50abe0322..cebe208e0 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index bfbc4cbbb..4b5b318da 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index e9e67c8fe..758081824 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 6dc9aa7cf..ebcc05275 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index ebb121158..b5cdec78e 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Template/app/layout.php b/app/Template/app/layout.php
index d5bb1d8ee..8a745327b 100644
--- a/app/Template/app/layout.php
+++ b/app/Template/app/layout.php
@@ -19,16 +19,6 @@
                 <i class="fa fa-folder fa-fw"></i>
                 <?= $this->url->link(t('Project management'), 'project', 'index') ?>
             </li>
-            <?php if ($this->user->hasAccess('user', 'index')): ?>
-                <li>
-                    <i class="fa fa-user fa-fw"></i>
-                    <?= $this->url->link(t('User management'), 'user', 'index') ?>
-                </li>
-                <li>
-                    <i class="fa fa-cog fa-fw"></i>
-                    <?= $this->url->link(t('Settings'), 'config', 'index') ?>
-                </li>
-            <?php endif ?>
         </ul>
     </div>
     <section class="sidebar-container" id="dashboard">
diff --git a/app/Template/header.php b/app/Template/header.php
index 074f8fd31..36db54d5e 100644
--- a/app/Template/header.php
+++ b/app/Template/header.php
@@ -54,9 +54,40 @@
                     <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-user fa-fw"></i><i class="fa fa-caret-down"></i></a>
                     <ul>
                         <li class="no-hover"><strong><?= $this->e($this->user->getFullname()) ?></strong></li>
-                        <li><?= $this->url->link(t('My dashboard'), 'app', 'index', array('user_id' => $this->user->getId())) ?></li>
-                        <li><?= $this->url->link(t('My profile'), 'user', 'show', array('user_id' => $this->user->getId())) ?></li>
-                        <li><?= $this->url->link(t('Logout'), 'auth', 'logout') ?></li>
+                        <li>
+                            <i class="fa fa-tachometer fa-fw"></i>
+                            <?= $this->url->link(t('My dashboard'), 'app', 'index', array('user_id' => $this->user->getId())) ?>
+                        </li>
+                        <li>
+                            <i class="fa fa-home fa-fw"></i>
+                            <?= $this->url->link(t('My profile'), 'user', 'show', array('user_id' => $this->user->getId())) ?>
+                        </li>
+                        <li>
+                            <i class="fa fa-folder fa-fw"></i>
+                            <?= $this->url->link(t('Projects management'), 'project', 'index') ?>
+                        </li>
+                        <?php if ($this->user->hasAccess('user', 'index')): ?>
+                            <li>
+                                <i class="fa fa-user fa-fw"></i>
+                                <?= $this->url->link(t('Users management'), 'user', 'index') ?>
+                            </li>
+                            <li>
+                                <i class="fa fa-group fa-fw"></i>
+                                <?= $this->url->link(t('Groups management'), 'group', 'index') ?>
+                            </li>
+                            <li>
+                                <i class="fa fa-cog fa-fw"></i>
+                                <?= $this->url->link(t('Settings'), 'config', 'index') ?>
+                            </li>
+                        <?php endif ?>
+                        <li>
+                            <i class="fa fa-life-ring fa-fw"></i>
+                            <?= $this->url->link(t('Documentation'), 'doc', 'show') ?>
+                        </li>
+                        <li>
+                            <i class="fa fa-sign-out fa-fw"></i>
+                            <?= $this->url->link(t('Logout'), 'auth', 'logout') ?>
+                        </li>
                     </ul>
                 </div>
             </li>