diff --git a/view/templates/contact_drop_confirm.tpl b/view/templates/contact_drop_confirm.tpl
index bb4d3a10c..df5e14ad5 100644
--- a/view/templates/contact_drop_confirm.tpl
+++ b/view/templates/contact_drop_confirm.tpl
@@ -1,8 +1,8 @@
 <h1>{{$l10n.header}}</h1>
 
-{{include file="contact_template.tpl" no_contacts_checkbox=True}}
+{{include file="contact/entry.tpl" no_contacts_checkbox=True}}
 
 {{include file="confirm.tpl"}}
 
 
-<div class="clear"></div>
\ No newline at end of file
+<div class="clear"></div>
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index 7ee38a64a..8c05b4869 100644
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -22,7 +22,7 @@
 <div id="directory-search-end"></div>
 
 {{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
+	{{include file="contact/entry.tpl"}}
 {{/foreach}}
 
 <div class="directory-end"></div>
diff --git a/view/templates/nogroup-template.tpl b/view/templates/nogroup-template.tpl
index 27626396c..8f1c939bb 100644
--- a/view/templates/nogroup-template.tpl
+++ b/view/templates/nogroup-template.tpl
@@ -2,12 +2,8 @@
 <h1>{{$header}}</h1>
 
 {{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
+	{{include file="contact/entry.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 
 {{$paginate nofilter}}
-
-
-
-
diff --git a/view/templates/profile/contacts.tpl b/view/templates/profile/contacts.tpl
index 7e2ae9e83..615ab1e0f 100644
--- a/view/templates/profile/contacts.tpl
+++ b/view/templates/profile/contacts.tpl
@@ -10,7 +10,7 @@
 {{if $contacts}}
 	<div id="viewcontact_wrapper-{{$id}}">
 	{{foreach $contacts as $contact}}
-		{{include file="contact_template.tpl"}}
+		{{include file="contact/entry.tpl"}}
 	{{/foreach}}
 	</div>
 {{else}}
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 1079a08c8..498ef69f2 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -179,7 +179,7 @@ function frio_contact_photo_menu(App $a, &$args)
 
 	// Add to pm link a new key with the value 'modal'.
 	// Later we can make conditions in the corresponding templates (e.g.
-	// contact_template.tpl)
+	// contact/entry.tpl)
 	if (strpos($pmlink, 'message/new/' . $cid) !== false) {
 		$args['menu']['pm'][3] = 'modal';
 	}