diff --git a/view/theme/vier/comment_item.tpl b/view/theme/vier/comment_item.tpl
index ac7073d71..fd27e494b 100644
--- a/view/theme/vier/comment_item.tpl
+++ b/view/theme/vier/comment_item.tpl
@@ -29,15 +29,16 @@
 				<div class="comment-edit-text-end"></div>
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
 
-				<div class="comment-edit-bb-$id">
-	                                <a class="icon bb-image" style="cursor: pointer;" title="$edimg" onclick="insertFormatting('$comment','img',$id);">img</a>      
-	                                <a class="icon bb-url" style="cursor: pointer;" title="$edurl" onclick="insertFormatting('$comment','url',$id);">url</a>
-	                                <a class="icon bb-video" style="cursor: pointer;" title="$edvideo" onclick="insertFormatting('$comment','video',$id);">video</a>                                
+				<div class="comment-edit-bb">
+	                                <a title="$edimg" onclick="insertFormatting('$comment','img',$id);"><i class="icon-picture"></i></a>      
+	                                <a title="$edurl" onclick="insertFormatting('$comment','url',$id);"><i class="icon-bookmark"></i></a>
+	                                <a title="$edvideo" onclick="insertFormatting('$comment','video',$id);"><i class="icon-film"></i></a>
                                                                                 
-	                                <a class="icon underline" style="cursor: pointer;" title="$eduline" onclick="insertFormatting('$comment','u',$id);">u</a>
-	                                <a class="icon italic" style="cursor: pointer;" title="$editalic" onclick="insertFormatting('$comment','i',$id);">i</a>
-	                                <a class="icon bold" style="cursor: pointer;"  title="$edbold" onclick="insertFormatting('$comment','b',$id);">b</a>
-	                                <a class="icon quote" style="cursor: pointer;" title="$edquote" onclick="insertFormatting('$comment','quote',$id);">quote</a>
+	                                <a title="$eduline" onclick="insertFormatting('$comment','u',$id);"><i class="icon-underline"></i></a>
+	                                <a title="$editalic" onclick="insertFormatting('$comment','i',$id);"><i class="icon-italic"></i></a>
+	                                <a title="$edbold" onclick="insertFormatting('$comment','b',$id);"><i class="icon-bold"></i></a>
+	                                <a title="$edquote" onclick="insertFormatting('$comment','quote',$id);"><i class="icon-comments"></i></a>
+
                                 </div>
 					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
 					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index f7e10c94d..e02a23dbe 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1743,7 +1743,7 @@ ul.tabs a {
     float: left;
 }
 
-ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
+ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink, .comment-edit-bb a{
     /* padding: 0px 10px 1px 10px; */
     padding: 0px 5px 1px 5px;
     -webkit-border-radius: 4px;
@@ -1764,7 +1764,7 @@ ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
     background: linear-gradient(top, #ffffff 0%,#ececf2 100%);
 }
 
-ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
+ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover, .comment-edit-bb a:hover {
 
     color: #fff;
     text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
@@ -1780,6 +1780,10 @@ ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-subm
     text-decoration: none;
 }
 
+.comment-edit-bb {
+  float:right;
+}
+
 /**
  * Form fields
  */
diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl
index 84f164b8e..db3e209b6 100644
--- a/view/theme/vier/wall_thread.tpl
+++ b/view/theme/vier/wall_thread.tpl
@@ -98,7 +98,7 @@
 				{{ endif }}
 			{{ endif }}
 			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-share icon-large"></i></a>
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-retweet icon-large"></i></a>
 			{{ endif }}
 			{{ if $item.star }}
 				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do"><i class="icon-star icon-large"></i></a>