diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index 2565419..a33a118 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 	
 	<div class="row">
 		<div class="col-md-2 col-sm-4">
diff --git a/templates/account/edit/email.tpl b/templates/account/edit/email.tpl
index 7a60267..fe88a28 100644
--- a/templates/account/edit/email.tpl
+++ b/templates/account/edit/email.tpl
@@ -1,4 +1,4 @@
-<!-- IMPORT partials/account_menu.tpl -->
+<!-- IMPORT partials/account/header.tpl -->
 
 <div class="col-md-5">
 	<form class="form-horizontal">
diff --git a/templates/account/edit/password.tpl b/templates/account/edit/password.tpl
index 67ef637..0172d29 100644
--- a/templates/account/edit/password.tpl
+++ b/templates/account/edit/password.tpl
@@ -1,4 +1,4 @@
-<!-- IMPORT partials/account_menu.tpl -->
+<!-- IMPORT partials/account/header.tpl -->
 
 <div class="col-md-5">
 	<form class='form-horizontal'>
diff --git a/templates/account/edit/username.tpl b/templates/account/edit/username.tpl
index 304c70a..3ccbd53 100644
--- a/templates/account/edit/username.tpl
+++ b/templates/account/edit/username.tpl
@@ -1,4 +1,4 @@
-<!-- IMPORT partials/account_menu.tpl -->
+<!-- IMPORT partials/account/header.tpl -->
 
 <div class="col-md-5">
 	<form class="form-horizontal">
diff --git a/templates/account/favourites.tpl b/templates/account/favourites.tpl
index 038367e..d83ac04 100644
--- a/templates/account/favourites.tpl
+++ b/templates/account/favourites.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 
 	<div class="favourites">
 
diff --git a/templates/account/followers.tpl b/templates/account/followers.tpl
index 051ed85..0c3b234 100644
--- a/templates/account/followers.tpl
+++ b/templates/account/followers.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 
 	<div class="users">
 
diff --git a/templates/account/following.tpl b/templates/account/following.tpl
index 4405195..5476540 100644
--- a/templates/account/following.tpl
+++ b/templates/account/following.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 
 	<div class="users">
 		<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
diff --git a/templates/account/groups.tpl b/templates/account/groups.tpl
index 26f0b92..828cbbf 100644
--- a/templates/account/groups.tpl
+++ b/templates/account/groups.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 
 	<div class="groups list">
 		<div component="groups/container" id="groups-list" class="row">
diff --git a/templates/account/posts.tpl b/templates/account/posts.tpl
index 8990204..a7bcc98 100644
--- a/templates/account/posts.tpl
+++ b/templates/account/posts.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 
 	<div class="favourites">
 
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 9c9f674..e1c1f80 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 
 	<div class="row">
 		<div class="col-md-5 account-block">
diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index f17ee24..121f733 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 	
 	<div class="row">
 		<div class="col-xs-12">
diff --git a/templates/account/topics.tpl b/templates/account/topics.tpl
index 2fa4edc..4b0f674 100644
--- a/templates/account/topics.tpl
+++ b/templates/account/topics.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 
 	<!-- IF !topics.length -->
 		<div class="alert alert-warning">[[user:has_no_topics]]</div>
diff --git a/templates/account/watched.tpl b/templates/account/watched.tpl
index e8b6a02..46eb0ae 100644
--- a/templates/account/watched.tpl
+++ b/templates/account/watched.tpl
@@ -1,5 +1,5 @@
 <div class="account">
-	<!-- IMPORT partials/account_menu.tpl -->
+	<!-- IMPORT partials/account/header.tpl -->
 
 	<!-- IF !topics.length -->
 		<div class="alert alert-warning">[[user:has_no_watched_topics]]</div>
diff --git a/templates/partials/account/header.tpl b/templates/partials/account/header.tpl
new file mode 100644
index 0000000..e0afc08
--- /dev/null
+++ b/templates/partials/account/header.tpl
@@ -0,0 +1,22 @@
+<!-- IMPORT partials/breadcrumbs.tpl -->
+
+<div class="cover" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
+	<!-- IF isSelf -->
+	<div class="controls">
+		<span class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></span>
+		<span class="resize"><i class="fa fa-fw fa-4x fa-arrows"></i></span>
+	</div>
+	<div class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
+	<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
+	<!-- ENDIF isSelf -->
+
+	<div class="avatar">
+		<!-- IF picture -->
+		<img src="{picture}" class="user-profile-picture" />
+		<!-- ELSE -->
+		<div class="user-icon user-profile-picture" style="background-color: {icon:bgColor};" title="{username}">{icon:text}</div>
+		<!-- ENDIF picture -->
+	</div>
+
+	<!-- IMPORT partials/account/menu.tpl -->
+</div>
\ No newline at end of file
diff --git a/templates/partials/account_menu.tpl b/templates/partials/account/menu.tpl
similarity index 70%
rename from templates/partials/account_menu.tpl
rename to templates/partials/account/menu.tpl
index bfeeb20..2ba6d54 100644
--- a/templates/partials/account_menu.tpl
+++ b/templates/partials/account/menu.tpl
@@ -1,5 +1,3 @@
-<!-- IMPORT partials/breadcrumbs.tpl -->
-
 <div class="btn-group account-fab">
 	<button type="button" class="fab dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		<i class="fa fa-ellipsis-v"></i>
@@ -27,23 +25,4 @@
 		<li id="{profile_links.id}" class="plugin-link <!-- IF profile_links.public -->public<!-- ELSE -->private<!-- ENDIF profile_links.public -->"><a href="{config.relative_path}/user/{userslug}/{profile_links.route}"><i class="fa fa-fw {profile_links.icon}"></i> {profile_links.name}</a></li>
 		<!-- END profile_links -->
 	</ul>
-</div>
-
-<div class="cover" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
-	<!-- IF isSelf -->
-	<div class="controls">
-		<span class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></span>
-		<span class="resize"><i class="fa fa-fw fa-4x fa-arrows"></i></span>
-	</div>
-	<div class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
-	<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
-	<!-- ENDIF isSelf -->
-
-	<div class="avatar">
-		<!-- IF picture -->
-		<img src="{picture}" class="user-profile-picture" />
-		<!-- ELSE -->
-		<div class="user-icon user-profile-picture" style="background-color: {icon:bgColor};" title="{username}">{icon:text}</div>
-		<!-- ENDIF picture -->
-	</div>
 </div>
\ No newline at end of file