diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 341727ceef..d9524a7390 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -527,7 +527,7 @@ class Profile
 
 		$p['url'] = Contact::magicLink(($p['url'] ?? '') ?: $profile_url);
 
-		$tpl = Renderer::getMarkupTemplate('profile_vcard.tpl');
+		$tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
 			'$profile' => $p,
 			'$xmpp' => $xmpp,
@@ -747,8 +747,6 @@ class Profile
 		$uid = intval($a->profile['uid']);
 
 		if ($a->profile['name']) {
-			$tpl = Renderer::getMarkupTemplate('profile_advanced.tpl');
-
 			$profile = [];
 
 			$profile['fullname'] = [DI::l10n()->t('Full Name:'), $a->profile['name']];
@@ -875,6 +873,7 @@ class Profile
 				$profile['edit'] = [DI::baseUrl() . '/profiles/' . $a->profile['id'], DI::l10n()->t('Edit profile'), '', DI::l10n()->t('Edit profile')];
 			}
 
+			$tpl = Renderer::getMarkupTemplate('profile/advanced.tpl');
 			return Renderer::replaceMacros($tpl, [
 				'$title' => DI::l10n()->t('Profile'),
 				'$basic' => DI::l10n()->t('Basic'),
diff --git a/src/Module/Register.php b/src/Module/Register.php
index 8a92b25088..98af06543d 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -87,7 +87,7 @@ class Register extends BaseModule
 		if (DI::config()->get('system', 'publish_all')) {
 			$profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
 		} else {
-			$publish_tpl = Renderer::getMarkupTemplate('profile_publish.tpl');
+			$publish_tpl = Renderer::getMarkupTemplate('profile/publish.tpl');
 			$profile_publish = Renderer::replaceMacros($publish_tpl, [
 				'$instance'     => 'reg',
 				'$pubdesc'      => DI::l10n()->t('Include your profile in member directory?'),
diff --git a/view/templates/profile_advanced.tpl b/view/templates/profile/advanced.tpl
similarity index 100%
rename from view/templates/profile_advanced.tpl
rename to view/templates/profile/advanced.tpl
diff --git a/view/templates/profile_publish.tpl b/view/templates/profile/publish.tpl
similarity index 100%
rename from view/templates/profile_publish.tpl
rename to view/templates/profile/publish.tpl
diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile/vcard.tpl
similarity index 100%
rename from view/templates/profile_vcard.tpl
rename to view/templates/profile/vcard.tpl
diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl
similarity index 100%
rename from view/theme/duepuntozero/templates/profile_vcard.tpl
rename to view/theme/duepuntozero/templates/profile/vcard.tpl
diff --git a/view/theme/frio/templates/profile_advanced.tpl b/view/theme/frio/templates/profile/advanced.tpl
similarity index 100%
rename from view/theme/frio/templates/profile_advanced.tpl
rename to view/theme/frio/templates/profile/advanced.tpl
diff --git a/view/theme/frio/templates/profile_publish.tpl b/view/theme/frio/templates/profile/publish.tpl
similarity index 100%
rename from view/theme/frio/templates/profile_publish.tpl
rename to view/theme/frio/templates/profile/publish.tpl
diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl
similarity index 100%
rename from view/theme/frio/templates/profile_vcard.tpl
rename to view/theme/frio/templates/profile/vcard.tpl
diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
similarity index 88%
rename from view/theme/quattro/templates/profile_vcard.tpl
rename to view/theme/quattro/templates/profile/vcard.tpl
index cd8bd6ee7c..fd455fba58 100644
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile/vcard.tpl
@@ -6,21 +6,10 @@
 			<div class="action">
 			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
 			<ul id="profiles-menu" class="menu-popup">
-			{{if $profile.menu.entries}}
-				{{foreach $profile.menu.entries as $e}}
-				<li>
-					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-				</li>
-				{{/foreach}}
-			{{else}}
 				<li>
 					<a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
 				</li>
-			{{/if}}
-				<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
-				{{if $profile.menu.cr_new }}
-				<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-				{{/if}}
+				<li><a href="settings/profile/photo" >{{$profile.menu.chg_photo}}</a></li>
 			</ul>
 			</div>
 		{{/if}}
diff --git a/view/theme/vier/templates/profile_advanced.tpl b/view/theme/vier/templates/profile/advanced.tpl
similarity index 100%
rename from view/theme/vier/templates/profile_advanced.tpl
rename to view/theme/vier/templates/profile/advanced.tpl
diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl
similarity index 100%
rename from view/theme/vier/templates/profile_vcard.tpl
rename to view/theme/vier/templates/profile/vcard.tpl