diff --git a/templates/layouts/header.html b/templates/layouts/header.html
index 4d221a3..2bb962d 100644
--- a/templates/layouts/header.html
+++ b/templates/layouts/header.html
@@ -23,17 +23,23 @@
 		     src="/images/icons/dashboard.png">
 		Dashboard
 	    </a>
+
+	    <a class="be-gui-link" href="/storage/manage">
+		<img alt="Dashboard"
+		     src="/images/icons/index.png">
+		Storage
+	    </a>
 	</div>
 	<div>
 	    <h2>Archive</h2>
 	    <a class="be-gui-link" href="/create/archive-entry">
 		<img alt="New Page"
-		     src="/images/icons/add-entry.png">
+		     src="/images/icons/add-circle.png">
 		Create Entry
 	    </a>
 	    <a class="be-gui-link" href="/user/archive">
 		<img alt="New Page"
-		     src="/images/icons/manage-archive.png">
+		     src="/images/icons/index.png">
 		Archive Index
 	    </a>
 	</div>
@@ -41,28 +47,28 @@
 	    <h2>Pages</h2>
 	    <a class="be-gui-link" href="/create/page">
 		<img alt="New Page"
-		     src="/images/icons/add-page.png">
+		     src="/images/icons/add-circle.png">
 		Add Page
 	    </a>
 	    <a class="be-gui-link" href="/user/pages">
 		<img alt="New Page"
-		     src="/images/icons/manage-pages.png">
+		     src="/images/icons/index.png">
 		Pages Index
 	    </a>
 	</div>
     </div>
     <div>
-	<h2>Settings</h2>
+	<h2>Accounts and Settings</h2>
 	<a class="be-gui-link" href="/user/edit">
 	    <img alt="Edit Profile"
 		 src="/images/icons/profile.png">
-	    Edit Account
+	    Account Details
 	</a>
 	{% if roles.administrator %}
 	<a class="be-gui-link" href="/users">
-	    <img alt="Site Settings"
-		 src="/images/icons/manage-users.png">
-	    Manage Users
+	    <img alt="Manage Accounts"
+		 src="/images/icons/index.png">
+	    Manage Accounts
 	</a>
 	<a class="be-gui-link" href="/site-settings">
 	    <img alt="Site Settings"