diff --git a/images/tag.png b/images/tag.png
new file mode 100644
index 0000000000..40c5fd44e2
Binary files /dev/null and b/images/tag.png differ
diff --git a/images/tag_b.png b/images/tag_b.png
new file mode 100644
index 0000000000..66c03415de
Binary files /dev/null and b/images/tag_b.png differ
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 29dc62b477..e3213b8911 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -29,6 +29,15 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</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>{{ endif }}
 		</div>
 		<div class="wall-item-actions">
@@ -66,7 +75,13 @@
 			
 		</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>	
+	</div>
 </div>
+
 <div class="wall-item-comment-wrapper" >
 	$comment
 </div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 7ae489e6a4..e47014985d 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -32,6 +32,15 @@
 			$body
 		</div>
 	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>	
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
 			{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
@@ -72,6 +81,11 @@
 			
 		</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>	
+	</div>	
 </div>
 <div class="wall-item-comment-wrapper" >
 	$comment