diff --git a/view/global.css b/view/global.css
index cd0253ac66..874b1d6e98 100644
--- a/view/global.css
+++ b/view/global.css
@@ -180,11 +180,6 @@ span.connector {
   margin-right: 9px;
 }
 
-.shared_header span {
-  display: table-cell;
-  float: none;
-}
-
 blockquote.shared_content {
   margin-left: 32px;
   color: #000;
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 014b3daaa3..e9b42ff409 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1747,19 +1747,24 @@ aside .panel-body {
 }
 
 /* wall-item content elements */
-.shared-wrapper,
+.shared-wrapper {
+	position: relative;
+	margin-top: 10px;
+	margin-bottom: 0;
+}
 .vevent {
     padding: 10px;
     box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05);
 }
 @media screen and (max-width: 767px) {
-    .shared-wrapper,
     .vevent {
-    margin-left: 0px;
-    margin-right: 0px;
+		margin-left: 0px;
+		margin-right: 0px;
     }
+	.shared-wrapper {
+		margin: 5px -10px 0;
+	}
 }
-.shared-wrapper:hover,
 .vevent:hover {
     box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05);
 }
@@ -1915,7 +1920,7 @@ code > .hl-main {
 /*
 * Comments
 */
-.well {
+wall-item-comment-wrapper.well {
     border: none;
     box-shadow: none;
     /*background-color: #ededed;*/
@@ -1923,14 +1928,14 @@ code > .hl-main {
     background-image: none;
     margin-bottom: 1px;
 }
-.well-small {
+wall-item-comment-wrapper.well-small {
     padding: 10px;
     border-radius: 3px;
 }
-.well hr {
+wall-item-comment-wrapper.well hr {
     border-top: 1px solid #d9d9d9;
 }
-.wall-entry .well {
+.wall-entry wall-item-comment-wrapper.well {
     margin-bottom: 0;
 }
 .comment-container {
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index ce5497dda5..a5b6d52d6d 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -92,11 +92,6 @@
 
 			{{* item content *}}
 			<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
-				{{* insert some space if it's an top-level post *}}
-				{{if $item.thread_level==1}}
-				<div style="height:10px;">&nbsp;</div> <!-- use padding/margin instead-->
-				{{/if}}
-
 				{{if $item.title}}
 				<span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h4><br /></span>
 				{{/if}}
diff --git a/view/theme/frio/templates/shared_content.tpl b/view/theme/frio/templates/shared_content.tpl
new file mode 100644
index 0000000000..a4f47e6184
--- /dev/null
+++ b/view/theme/frio/templates/shared_content.tpl
@@ -0,0 +1,24 @@
+<div class="shared-wrapper well well-sm">
+	<div class="shared_header">
+		{{if $avatar}}
+			<a href="{{$profile}}" target="_blank" rel="noopener noreferrer" class="shared-userinfo">
+				<img src="{{$avatar}}" height="32" width="32">
+			</a>
+		{{/if}}
+		<div><a href="{{$profile}}" target="_blank" rel="noopener noreferrer" class="shared-wall-item-name"><span class="shared-author">{{$author}}</span></a></div>
+		<div class="preferences">
+			{{if $network_icon}}
+				<span class="wall-item-network"><i class="fa fa-{{$network_icon}}" title="{{$network_name}}" aria-hidden="true"></i></span>
+			{{else}}
+				<span class="wall-item-network">{{$network_name}}</span>
+			{{/if}}
+			{{if $link}}
+				<a href="{{$link}}" class="plink u-url" aria-label="{{$link_title}}" title="{{$link_title}}">
+					<i class="fa fa-external-link"></i>
+				</a>
+			{{/if}}
+		</div>
+		<div class="shared-wall-item-ago"><small><span class="shared-time">{{$posted}}</span></small></div>
+	</div>
+	<blockquote class="shared_content">{{$content nofilter}}</blockquote>
+</div>