diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 22d3f13b0b..8436b56d51 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -486,6 +486,7 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
+
   z-index: 110;
   color: #ffffff;
 }
@@ -815,6 +816,7 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
+
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -896,6 +898,7 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+
 }
 .widget h3 {
   padding: 0px;
@@ -1160,6 +1163,9 @@ section {
   color: #2d2d2d;
   border: 1px solid #2d2d2d;
 }
+.wall-item-comment-wrapper.photo {
+  margin: 1em 2em 1em 0px;
+}
 .threaded .wall-item-comment-wrapper {
   margin-left: 0px;
 }
@@ -1174,6 +1180,7 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 24ce51c65b..19c5170066 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -486,6 +486,7 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
+
   z-index: 110;
   color: #ffffff;
 }
@@ -815,6 +816,7 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
+
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -896,6 +898,7 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+
 }
 .widget h3 {
   padding: 0px;
@@ -1160,6 +1163,9 @@ section {
   color: #2d2d2d;
   border: 1px solid #2d2d2d;
 }
+.wall-item-comment-wrapper.photo {
+  margin: 1em 2em 1em 0px;
+}
 .threaded .wall-item-comment-wrapper {
   margin-left: 0px;
 }
@@ -1174,6 +1180,7 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 7c002b112e..9b191dab97 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -486,6 +486,7 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
+
   z-index: 110;
   color: #ffffff;
 }
@@ -815,6 +816,7 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
+
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -896,6 +898,7 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+
 }
 .widget h3 {
   padding: 0px;
@@ -1160,6 +1163,9 @@ section {
   color: #2d2d2d;
   border: 1px solid #2d2d2d;
 }
+.wall-item-comment-wrapper.photo {
+  margin: 1em 2em 1em 0px;
+}
 .threaded .wall-item-comment-wrapper {
   margin-left: 0px;
 }
@@ -1174,6 +1180,7 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 96019e0927..60f70d421a 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -586,6 +586,10 @@ section {
 		color: @CommentBoxFullColor;
 		border: 1px solid @CommentBoxFullBorderColor;
 	}
+	
+	&.photo {
+		margin: 1em 2em 1em 0px;
+	}
 }
 
 .threaded .wall-item-comment-wrapper { margin-left: 0px; }
diff --git a/view/theme/quattro/templates/photo_item.tpl b/view/theme/quattro/templates/photo_item.tpl
new file mode 100644
index 0000000000..12c43eb0b2
--- /dev/null
+++ b/view/theme/quattro/templates/photo_item.tpl
@@ -0,0 +1,79 @@
+<div class="wall-item-container {{$indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper">
+				<a href="{{$profile_url}}" target="redir" title="{{$linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
+					<img src="{{$thumb}}" class="contact-photo{{$sparkle}}" id="wall-item-photo-{{$id}}" alt="{{$name}}" />
+				</a>
+			</div>
+			<div class="wall-item-location">{{$location}}</div>	
+		</div>
+		<div class="wall-item-content">
+			{{if $title}}<h2><a href="{{$plink.href}}">{{$title}}</a></h2>{{/if}}
+			{{$body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+			{{if $plink}}<a class="icon s16 link" title="{{$plink.title}}" href="{{$plink.href}}">{{$plink.title}}</a>{{/if}}
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="{{$profile_url}}" target="redir" title="{{$linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$sparkle}}">{{$name}}</span></a> <span class="wall-item-ago" title="{{$localtime}}">{{$ago}}</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{if $star}}
+				<a href="#" id="star-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classdo}}"  title="{{$star.do}}">{{$star.do}}</a>
+				<a href="#" id="unstar-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classundo}}"  title="{{$star.undo}}">{{$star.undo}}</a>
+				<a href="#" id="tagger-{{$id}}" onclick="itemTag({{$id}}); return false;" class="{{$star.classtagger}}" title="{{$star.tagger}}">{{$star.tagger}}</a>
+			{{/if}}
+			
+			{{if $vote}}
+				<a href="#" id="like-{{$id}}" title="{{$vote.like.0}}" onclick="dolike({{$id}},'like'); return false">{{$vote.like.1}}</a>
+				<a href="#" id="dislike-{{$id}}" title="{{$vote.dislike.0}}" onclick="dolike({{$id}},'dislike'); return false">{{$vote.dislike.1}}</a>
+			{{/if}}
+						
+			{{if $vote.share}}
+				<a href="#" id="share-{{$id}}" title="{{$vote.share.0}}" onclick="jotShare({{$id}}); return false">{{$vote.share.1}}</a>
+			{{/if}}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $drop.pagedrop}}
+					<input type="checkbox" title="{{$drop.select}}" name="itemselected[]" class="item-select" value="{{$id}}" />
+				{{/if}}
+				{{if $drop.dropping}}
+					<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$drop.delete}}">{{$drop.delete}}</a>
+				{{/if}}
+				{{if $edpost}}
+					<a class="icon edit s16" href="{{$edpost.0}}" title="{{$edpost.1}}"></a>
+				{{/if}}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$id}}">{{$like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$id}}">{{$dislike}}</div>
+		{{if $conv}}
+		<div class="wall-item-conv" id="wall-item-conv-{{$id}}" >
+			<a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title}}'>{{$conv.title}}</a>
+		</div>
+		{{/if}}
+	</div>
+	
+	
+</div>
+
diff --git a/view/theme/quattro/templates/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl
index 8456a2747a..463969e78e 100644
--- a/view/theme/quattro/templates/photo_view.tpl
+++ b/view/theme/quattro/templates/photo_view.tpl
@@ -29,7 +29,8 @@
 	{{$dislike}}	
 </div>
 {{/if}}
-<div class="wall-item-comment-wrapper">
+
+<div class="wall-item-comment-wrapper photo">
     {{$comments}}
 </div>
 
diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl
index 88739ff47a..132d1d32d3 100644
--- a/view/theme/quattro/templates/search_item.tpl
+++ b/view/theme/quattro/templates/search_item.tpl
@@ -83,8 +83,8 @@
 		{{if $item.conv}}
 		<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
 			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-		{{/if}}
 		</div>
+		{{/if}}
 	</div>