diff --git a/view/templates/shared_content.tpl b/view/templates/shared_content.tpl
index c3a808d732..83e5dd2579 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>