diff --git a/view/css/conversation.css b/view/css/conversation.css
index 03713e6eb..ab6eb3c01 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -133,10 +133,6 @@
 	margin: 5px;
 }
 
-.wall-item-lock {
-	float: left;
-}
-
 a.wall-item-name-link {
 	font-weight: bold !important;
 }
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index f676c04c9..3f760998d 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -72,9 +72,8 @@
 						</div>
 					</div>
 					<div class="wall-item-author">
-						{{if $item.previewing}}<span class="preview-indicator"><i class="fa fa-eye" title="{{$item.preview_lbl}}"></i></span>{{/if}}
 						{{if $item.lock}}
-						<div class="wall-item-lock dropdown">
+						<div class="float-start dropdown wall-item-lock">
 							<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else if $item.locktype == 1}}fa-lock{{else}}fa-unlock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
 							<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
 						</div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 37975eb20..0024ec382 100644
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -72,9 +72,8 @@
 						</div>
 					</div>
 					<div class="wall-item-author">
-						{{if $item.previewing}}<span class="preview-indicator"><i class="fa fa-eye" title="{{$item.preview_lbl}}"></i></span>{{/if}}
 						{{if $item.lock}}
-						<div class="wall-item-lock dropdown">
+						<div class="float-start dropdown wall-item-lock">
 							<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else if $item.locktype == 1}}fa-lock{{else}}fa-unlock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
 							<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
 						</div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 2b36e62fc..b2a99b64a 100644
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -66,9 +66,13 @@
 					</div>
 				</div>
 				<div class="wall-item-author">
-					{{if $item.previewing}}<span class="preview-indicator"><i class="fa fa-eye" title="{{$item.preview_lbl}}"></i></span>{{/if}}
+					{{if $item.previewing}}
+					<div class="float-start me-1 preview-indicator">
+						<i class="fa fa-eye" title="{{$item.preview_lbl}}"></i>
+					</div>
+					{{/if}}
 					{{if $item.lock}}
-					<div class="wall-item-lock dropdown">
+					<div class="float-start dropdown wall-item-lock">
 						<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else if $item.locktype == 1}}fa-lock{{else}}fa-unlock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
 						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
 					</div>