diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index e68314797..ab67bc196 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -21,35 +21,41 @@
 				{{/if}}
 				<div class="clear"></div>
 				<div id="comment-tools-{{$id}}" class="comment-tools">
-					<div id="comment-edit-bb-{{$id}}" class="btn-group pull-left">
-						<button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
-							<i class="icon-bold comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;">
-							<i class="icon-italic comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;">
-							<i class="icon-underline comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;">
-							<i class="icon-quote-left comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
-							<i class="icon-terminal comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;">
-							<i class="icon-camera comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', {{$id}}); return false;">
-							<i class="icon-link comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;">
-							<i class="icon-facetime-video comment-icon"></i>
-						</button>
+					<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
+						<div class='btn-group'>
+							<button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
+								<i class="icon-bold comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;">
+								<i class="icon-italic comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;">
+								<i class="icon-underline comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;">
+								<i class="icon-quote-left comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
+								<i class="icon-terminal comment-icon"></i>
+							</button>
+						</div>
+						<div class='btn-group'>
+							<button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;">
+								<i class="icon-camera comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', {{$id}}); return false;">
+								<i class="icon-link comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;">
+								<i class="icon-facetime-video comment-icon"></i>
+							</button>
+						</div>
 						{{if $feature_encrypt}}
-						<button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
-							<i class="icon-key comment-icon"></i>
-						</button>
+						<div class='btn-group'>
+							<button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
+								<i class="icon-key comment-icon"></i>
+							</button>
+						</div>
 						{{/if}}
 					</div>
 					<div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}">
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index f172a6dfa..826a3dd38 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -36,40 +36,46 @@
 			<textarea class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea>
 		</div>
 		<div id="profile-jot-submit-wrapper" class="jothidden">
-			<div id="profile-jot-submit-left" class="btn-group pull-left">
+			<div id="profile-jot-submit-left" class="btn-toolbar pull-left">
 				{{if $visitor}}
-				<button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" >
-					<i class="icon-camera jot-icons"></i>
-				</button>
-				<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
-					<i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i>
-				</button>
-				<button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
-					<i id="profile-link" class="icon-link jot-icons"></i>
-				</button>
-				<button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;">
-					<i id="profile-video" class="icon-facetime-video jot-icons"></i>
-				</button>
-				<button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;">
-					<i id="profile-audio" class="icon-volume-up jot-icons"></i>
-				</button>
-				<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
-					<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
-				</button>
-				<button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
-					<i id="profile-location" class="icon-globe jot-icons"></i>
-				</button>
+				<div class='btn-group'>
+					<button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" >
+						<i class="icon-camera jot-icons"></i>
+					</button>
+					<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
+						<i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i>
+					</button>
+					<button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
+						<i id="profile-link" class="icon-link jot-icons"></i>
+					</button>
+					<button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;">
+						<i id="profile-video" class="icon-facetime-video jot-icons"></i>
+					</button>
+					<button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;">
+						<i id="profile-audio" class="icon-volume-up jot-icons"></i>
+					</button>
+				</div>
+				<div class='btn-group'>
+					<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
+						<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
+					</button>
+					<button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
+						<i id="profile-location" class="icon-globe jot-icons"></i>
+					</button>
+				{{else}}
+				<div class='btn-group'>
 				{{/if}}
 				{{if $feature_expire}}
-				<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
-					<i id="profile-expires" class="icon-eraser jot-icons"></i>
-				</button>
+					<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
+						<i id="profile-expires" class="icon-eraser jot-icons"></i>
+					</button>
 				{{/if}}
 				{{if $feature_encrypt}}
-				<button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
-					<i id="profile-encrypt" class="icon-key jot-icons"></i>
-				</button>
+					<button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
+						<i id="profile-encrypt" class="icon-key jot-icons"></i>
+					</button>
 				{{/if}}
+				</div>
 			</div>
 			<div id="profile-rotator-wrapper">
 				<div id="profile-rotator"></div>