diff --git a/mod/photos.php b/mod/photos.php
index 1ec16898b..0e9055d05 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1640,10 +1640,15 @@ function photos_content(&$a) {
 
 					$profile_link = $profile_url;
 
-					$drop = '';
-
-					if(($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()))
-						$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+					
+					
+					$dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
+					$drop = array(
+						'dropping' => $dropping,
+						'pagedrop' => false,
+						'select' => t('Select'),
+						'delete' => t('Delete'),
+					);
 
 
 					if($a->theme['template_engine'] === 'internal') {
diff --git a/view/templates/photo_drop.tpl b/view/templates/photo_drop.tpl
deleted file mode 100644
index ed500fd0a..000000000
--- a/view/templates/photo_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
-	<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-</div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/templates/photo_item.tpl b/view/templates/photo_item.tpl
index 7d6ac96ee..d1ed78b7e 100644
--- a/view/templates/photo_item.tpl
+++ b/view/templates/photo_item.tpl
@@ -17,7 +17,14 @@
 		<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
 		<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
 	</div>
-	{{$drop}}
+	
+	{{if $drop.dropping }}
+		<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
+			<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+		</div>
+		<div class="wall-item-delete-end"></div>
+	{{/if}}
+
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-comment-separator"></div>
 	{{$comment}}