diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-facebook.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-facebook.html
index f6f67275..dac38732 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-facebook.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-facebook.html
@@ -1,5 +1,5 @@
 <f:if condition="{0:feed.raw.type}!={0:'status'}">
-	<div class="pb-list-item pb-list-item-facebook pb-hidden socialmedia__item"
+	<a href="{feed.link}" target="_blank" title="{feed.text}" class="pb-list-item pb-list-item-facebook pb-hidden socialmedia__item"
          data-type="{feed.raw.type}" data-id="{feed.id}" data-url="{feed.link}">
 		<f:if condition="{feed.raw.picture}">
 			<f:then>
@@ -28,14 +28,14 @@
             <span><i class="fb-like-detail__sad" ></i>{feed.raw.reactions_detail.SAD}</span>
             <span><i class="fb-like-detail__angry"></i>{feed.raw.reactions_detail.ANGRY}</span>
         </div></div>
-		<a class="additional-info info-1" href="{feed.link}" target="_blank">
+		<span class="additional-info info-1">
 			<f:count>{feed.raw.reactions.data}</f:count>
-		</a>
-		<a class="additional-info info-2" href="{feed.link}" target="_blank">
+		</span>
+		<span class="additional-info info-2">
 			<f:count>{feed.raw.comments.data}</f:count>
-		</a>
+		</span>
 		<f:if condition="{0:feed.raw.type}=={0:'video'}">
 			<img class="video-overlay" src="/typo3conf/ext/pb_social/Resources/Public/Icons/play_icon.png"/>
 		</f:if>
-	</div>
+	</a>
 </f:if>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-instagram.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-instagram.html
index 6eaf6005..2cdde677 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-instagram.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-instagram.html
@@ -1,9 +1,9 @@
-<div class="pb-list-item pb-list-item-instagram pb-hidden socialmedia__item" data-type="" data-url="{feed.link}">
+<a href="{feed.link}" target="_blank" class="pb-list-item pb-list-item-instagram pb-hidden socialmedia__item" data-type="" data-url="{feed.link}">
 	<div class="image" style="background-image: url({feed.image})"></div>
 	<f:if condition="{feed.text}">
 		<span class="text">{feed.text}</span>
 	</f:if>
 	<div class="icon"></div>
-	<a class="additional-info info-1" href="{feed.link}">{feed.raw.likes.count}</a>
-	<a class="additional-info info-2" href="{feed.link}">{feed.raw.comments.count}</a>
-</div>
+	<span class="additional-info info-1">{feed.raw.likes.count}</span>
+    <span class="additional-info info-2">{feed.raw.comments.count}</span>
+</a>