diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 1f2b761703..9722a6e1d4 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -169,29 +169,34 @@
 
 					{{* Buttons for like and dislike *}}
 					{{if $item.vote}}
-					<div class="vote-like pull-left">
+						{{if $item.vote.like}}
 						<a role="button" href="#" class="button-likes" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;">{{$item.vote.like.0}}</a>
+						{{/if}}
+
+						{{if $item.vote.like AND $item.vote.dislike}}
+						<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+						{{/if}}
 
 						{{if $item.vote.dislike}}
-						<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
 						<a role="button" href="#" class="button-likes" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;">{{$item.vote.dislike.0}}</a>
 						{{/if}}
 
-						{{if $item.comment}}<span role="presentation" class="separator">&nbsp;•&nbsp;</span>{{/if}}
-					</div>
+						{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
+						<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+						{{/if}}
 					{{/if}}
 
 					{{* Butten to open the comment text field *}}
 					{{if $item.comment}}
-					<div id="button-reply" class="pull-left">
-						<a role="button" class="" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}} </a>
-					</div>
+					<a role="button" class="" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}} </a>
 					{{/if}}
 
 					{{* Button for sharing the item *}}
 					{{if $item.vote}}
-						{{if $item.vote.share}}
+						{{if ($item.vote.like OR $item.vote.dislike OR $item.comment) AND $item.vote.share}}
 						<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+						{{/if}}
+						{{if $item.vote.share}}
 						<a role="button" href="#" class="" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</a>
 						{{/if}}
 					{{/if}}
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index ceef9230d1..b2e10a10a1 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -284,7 +284,6 @@ as the value of $top_child_total (this is done at the end of this file)
 
 				{{* Buttons for like and dislike *}}
 				{{if $item.vote}}
-				<div class="vote-like pull-left">
 					{{if $item.vote.like}}
 					<a role="button" class="button-likes" id="like-{{$item.id}}" title="{{$item.vote.like.1}}" onclick="dolike({{$item.id}},'like'); return false;"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</a>
 					{{/if}}
@@ -300,14 +299,11 @@ as the value of $top_child_total (this is done at the end of this file)
 					{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
 					<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
 					{{/if}}
-				</div>
 				{{/if}}
 
 				{{* Butten to open the comment text field *}}
 				{{if $item.comment}}
-				<div id="button-reply" class="pull-left">
-					<a role="button" class="button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i>&nbsp;{{$item.switchcomment}}</a>
-				</div>
+				<a role="button" class="button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i>&nbsp;{{$item.switchcomment}}</a>
 				{{/if}}
 
 				{{* Button for sharing the item *}}