diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index 4838208709..e9b4bc8b2b 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -28,7 +28,7 @@ background: #444;
 
 }
 .wall-item-tools {	background-color: #444444;   background-image: none;}
-.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #444444; }
 .comment-edit-preview{ color: #000000; }
 .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
 .photo-top-album-name{ background-color: #333333; }
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 9a8cffa2be..a10ba797b2 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1179,7 +1179,6 @@ input#dfrn-url {
 }
 
 .comment-wwedit-wrapper {
-	margin-top: 15px;
 	background: #f3f3f3;
 }
 
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
index 8142a7842a..31c70b27d2 100644
--- a/view/wall_thread.tpl
+++ b/view/wall_thread.tpl
@@ -67,12 +67,15 @@
 			{{ endif }}
 			{{ if $item.filer }}
 			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
+			{{ endif }}	
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
 				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
 				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
+			<div class="wall-item-delete-end"></div>			
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
 		</div>
 	</div>
 	<div class="wall-item-wrapper-end"></div>
@@ -83,9 +86,6 @@
 {{ for $item.children as $item }}
 	{{ inc $item.template }}{{ endinc }}
 {{ endfor }}
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
 
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{endif}}