diff --git a/templates/layouts/header.html b/templates/layouts/header.html
index dc41579..cebfc02 100644
--- a/templates/layouts/header.html
+++ b/templates/layouts/header.html
@@ -62,12 +62,12 @@
 	<a class="be-gui-link" href="/user/edit">
 	    <img alt="Edit Profile"
 		 src="/images/icons/profile.png">
-	    Account Details
+	    My Account Details
 	</a>
 	{% if roles.administrator %}
 	<a class="be-gui-link" href="/users">
 	    <img alt="Manage Accounts"
-		 src="/images/icons/index.png">
+		 src="/images/icons/all-accounts.png">
 	    Manage Accounts
 	</a>
 	<a class="be-gui-link" href="/site-settings">
diff --git a/templates/user/dashboard.html b/templates/user/dashboard.html
index 53dd5f5..190918a 100644
--- a/templates/user/dashboard.html
+++ b/templates/user/dashboard.html
@@ -222,13 +222,13 @@
 	  <a class="be-gui-link" href="/user/edit">
 		<img alt="Edit Profile"
 		     src="/images/icons/profile.png">
-		Account Details
+		My Account Details
 	    </a>
 	    {% if roles.administrator %}
 	    <a class="be-gui-link" href="/users">
 		<img alt="Manage Accounts"
-		     src="/images/icons/index.png">
-		Accounts Index
+		     src="/images/icons/all-accounts.png">
+		Manage Accounts
 	    </a>
 	    <a class="be-gui-link" href="/site-settings">
 		<img alt="Site Settings"