diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html
index d98cc654..1455ce99 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html
@@ -69,19 +69,13 @@
                     </ul>
                 </f:if>
                 <f:if condition="{newsItem.allRelatedSorted}">
-                    <h3 class="headline headline--underlined">
+                    <h3 class="headline headline--underlined mt-8">
                         Ähnliche Beiträge
                     </h3>
-                    <ul class="list-none p-0 mb-4">
-                        <f:for each="{newsItem.allRelatedSorted}" as="related">
-                            <li>
-                                <n:link newsItem="{related}" settings="{settings}" title="{related.title}">
-                                    {related.title}
-                                </n:link>
-                            </li>
-
-                        </f:for>
-                    </ul>
+                    <f:for each="{newsItem.allRelatedSorted}" as="newsItem" iteration="iterator">
+                        <f:render partial="List/Item"
+                                  arguments="{newsItem: newsItem,settings:settings,iterator:iterator}" />
+                    </f:for>
                 </f:if>
                 <f:if condition="{settings.backPid}">
                     <f:link.typolink parameter="{settings.backPid}" class="button bg-button button--small">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/Tag/List.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/Tag/List.html
index 3b9f62d5..5db40bb3 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/Tag/List.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/Tag/List.html
@@ -4,22 +4,17 @@
 
     <f:section name="content">
         <f:if condition="{tags}">
-            <h3>Themen</h3>
-            <ul class="blog-tags">
+            <h3 class="headline headline--underlined">Themen</h3>
+            <ul>
                 <f:for each="{tags}" as="tag">
                     <li>
-                        <f:if condition="{tag.uid} == {overwriteDemand.tags}">
-                            <f:then>
-                                <f:link.page title="{tag.title}" class="active" pageUid="{settings.listPid}" additionalParams="{tx_news_pi1:{overwriteDemand:{tags: tag}}}">
-                                    {tag.title}
-                                </f:link.page>
-                            </f:then>
-                            <f:else>
-                                <f:link.page title="{tag.title}" pageUid="{settings.listPid}" additionalParams="{tx_news_pi1:{overwriteDemand:{tags: tag}}}">
-                                    {tag.title}
-                                </f:link.page>
-                            </f:else>
-                        </f:if>
+                        <f:link.page title="{tag.title}" pageUid="{settings.listPid}" additionalParams="{tx_news_pi1:{overwriteDemand:{tags: tag}}}"
+                                     class="flex items-center space-x-2 {f:if(condition: '{tag.uid} == {overwriteDemand.tags}', then: 'text-ep-primary-dark')}">
+                            <svg class="w-5 h-5">
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-tag"></use>
+                            </svg>
+                            <span class="flex-1">{tag.title}</span>
+                        </f:link.page>
                     </li>
                 </f:for>
             </ul>