diff --git a/view/templates/shared_content.tpl b/view/templates/shared_content.tpl
index c3a808d732..c7c5cde61a 100644
--- a/view/templates/shared_content.tpl
+++ b/view/templates/shared_content.tpl
@@ -22,16 +22,15 @@
 			</p>
 		</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}}
+			{{if $network_icon && $link}}
+   				<span class="wall-item-network"><a href="{{$link}}" class="plink u-url" aria-label="{{$link_title}}" target="_blank"><i class="fa fa-{{$network_icon}} fakelink" title="{{$network_name}} - {{$link_title}}" aria-hidden="true"></i></a></span>
+			{{elseif $link}}
+       				<a href="{{$link}}" class="plink u-url" aria-label="{{$link_title}}" title="{{$network_name}} - {{$link_title}}" target="_blank">{{$network_name}}</a>
+   			{{elseif $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" title="{{$app}}">{{$network_name}}</span>
+    			{{/if}}
 		</div>
 	</div>
 	<blockquote class="shared_content" dir="auto">{{$content nofilter}}</blockquote>
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 513ee0a1c2..f23e71d995 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -29,16 +29,15 @@
 			{{* contact info header*}}
 			<div class="contact-info hidden-sm hidden-xs media-body"><!-- Desktop -->
 				<div class="preferences">
-					{{if $item.network_icon != ""}}
+					{{if $item.network_icon && $item.plink}}
+						<span class="wall-item-network"><a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" target="_blank"><i class="fa fa-{{$item.network_icon}} fakelink" title="{{$item.network_name}} - {{$item.plink.title}}" aria-hidden="true"></i></a></span>
+					{{elseif $item.plink}}
+						<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.network_name}} - {{$item.plink.title}}" target="_blank">{{$item.network_name}}</a>
+					{{elseif $item.network_icon}}
 						<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
 					{{else}}
 						<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
 					{{/if}}
-					{{if $item.plink}}	{{*link to the original source of the item *}}
-						<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
-							<i class="fa fa-external-link"></i>
-						</a>
-					{{/if}}
 				</div>
 				<h4 class="media-heading">
 					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card">
@@ -83,16 +82,15 @@
 			{{* contact info header for smartphones *}}
 			<div class="contact-info contact-info-xs hidden-lg hidden-md">
 				<div class="preferences">
-					{{if $item.network_icon != ""}}
-						<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
-					{{else}}
-						<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
-					{{/if}}
-					{{if $item.plink}}	{{*link to the original source of the item *}}
-						<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
-							<i class="fa fa-external-link"></i>
-						</a>
-					{{/if}}
+					{{if $item.network_icon && $item.plink}}
+   						<span class="wall-item-network"><a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" target="_blank"><i class="fa fa-{{$item.network_icon}} fakelink" title="{{$item.network_name}} - {{$item.plink.title}}" aria-hidden="true"></i></a></span>
+					{{elseif $item.plink}}
+       						<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.network_name}} - {{$item.plink.title}}" target="_blank">{{$item.network_name}}</a>
+   					{{elseif $item.network_icon}}
+       						<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
+    					{{else}}
+        					<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
+    					{{/if}}
 				</div>
 				<h5 class="media-heading">
 					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a>