diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb
index 94f7c767b..e73a37b57 100644
--- a/app/views/admin/dashboard/index.html.erb
+++ b/app/views/admin/dashboard/index.html.erb
@@ -1,12 +1,3 @@
-<%= link_to admin_settings_path, class: "button float-right" do %>
-  <span class="icon-settings"></span>
-  <%= t("admin.menu.settings") %>
-<% end %>
-
-<%= link_to admin_stats_path, class: "button float-right" do %>
-  <span class="icon-stats"></span>
-  <%= t("admin.menu.stats") %>
-<% end %>
 <div class="float-right">
   <%= link_to root_path do %>
     <%= t("admin.dashboard.index.back") + " " + setting['org_name'] %>
diff --git a/app/views/admin/shared/_admin_shortcuts.html.erb b/app/views/admin/shared/_admin_shortcuts.html.erb
new file mode 100644
index 000000000..5ce0bf9b7
--- /dev/null
+++ b/app/views/admin/shared/_admin_shortcuts.html.erb
@@ -0,0 +1,11 @@
+<li>
+  <%= link_to admin_stats_path, title: t("admin.menu.stats") do %>
+    <span class="icon-stats"></span>
+
+  <% end %>
+</li>
+<li>
+  <%= link_to admin_settings_path, title: t("admin.menu.settings") do %>
+    <span class="icon-settings"></span>
+  <% end %>
+</li>
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index c7dba228f..e9ccdd998 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -26,6 +26,7 @@
 
         <div class="top-bar-right">
           <ul class="dropdown menu" data-dropdown-menu>
+            <%= render "admin/shared/admin_shortcuts" %>
             <%= render "shared/admin_login_items" %>
             <%= render "devise/menu/login_items" %>
           </ul>