diff --git a/typo3/sysext/backend/Resources/Private/Partials/ShortcutToolbarItem/Shortcut.html b/typo3/sysext/backend/Resources/Private/Partials/ShortcutToolbarItem/Shortcut.html
index bfa749cc1937c87f822e7df3ad604b0c1f5199a1..a893c7e0cdc943cfc535142eb95c7a8f3f7d39ad 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/ShortcutToolbarItem/Shortcut.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/ShortcutToolbarItem/Shortcut.html
@@ -1,11 +1,11 @@
 <div class="dropdown-table-row t3js-topbar-shortcut" data-shortcutid="{shortcut.raw.uid}" data-shortcutgroup="{group.id}">
     <div class="dropdown-table-column dropdown-table-title">
-        <f:link.external uri="#" class="dropdown-table-title-ellipsis" onclick="{shortcut.action} return false;" defaultScheme="">
+        <a href="#" class="dropdown-table-title-ellipsis" onclick="{shortcut.action} return false;">
             <span title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.shortcut')}">
                 <f:format.raw>{shortcut.icon}</f:format.raw>
             </span>
             {shortcut.label}
-        </f:link.external>
+        </a>
     </div>
     <div class="dropdown-table-column dropdown-table-actions">
         <f:render section="Edit"/>
@@ -14,17 +14,15 @@
 </div>
 
 <f:section name="Edit">
-    <f:link.external uri="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-edit t3js-shortcut-edit"
-                                    title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit')}"
-                                    defaultScheme="">
+    <a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-edit t3js-shortcut-edit"
+        title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit')}">
         <core:icon identifier="actions-open" alternativeMarkupIdentifier="inline"/>
-    </f:link.external>
+    </a>
 </f:section>
 
 <f:section name="Delete">
-    <f:link.external uri="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-delete t3js-shortcut-delete"
-                                    title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete')}"
-                                    defaultScheme="">
+    <a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-delete t3js-shortcut-delete"
+        title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete')}">
         <core:icon identifier="actions-delete" alternativeMarkupIdentifier="inline"/>
-    </f:link.external>
+    </a>
 </f:section>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html b/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html
index 67abdebe7097f873d9ea7dbbdf284e1c4dc725df..f9bd9e00324db25ff1a1ca0dccb1d6ab3a11ec25 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html
@@ -73,15 +73,15 @@
                             <f:if condition="{isNotInTopLevelKeyList}">
                                 <f:then>
                                     <f:if condition="{hasProperties}">
-                                        <f:link.external uri="{moduleUrlObjectListAction}" defaultScheme="" class="btn btn-default">
+                                        <a href="{moduleUrlObjectListAction}" class="btn btn-default">
                                             <f:translate key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_objbrowser.xlf:addKey" arguments="{0:'{typoScriptPath}'}"/>
-                                        </f:link.external>
+                                        </a>
                                     </f:if>
                                 </f:then>
                                 <f:else>
-                                    <f:link.external uri="{moduleUrlObjectListAction}" defaultScheme="" class="btn btn-default">
+                                    <a href="{moduleUrlObjectListAction}" class="btn btn-default">
                                         <f:translate key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_objbrowser.xlf:removeKey" arguments="{0:'{typoScriptPath}'}"/>
-                                    </f:link.external>
+                                    </al>
                                 </f:else>
                             </f:if>
                         </div>
@@ -94,9 +94,9 @@
         </f:if>
         <div class="row mt-3">
             <div class="col-auto">
-                <f:link.external uri="{moduleUrl}" defaultScheme="" class="btn btn-default">
+                <a href="{moduleUrl}" class="btn btn-default">
                     <core:icon identifier="actions-chevron-left" />&nbsp;<f:translate key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_objbrowser.xlf:back"/>
-                </f:link.external>
+                </a>
             </div>
         </div>
     </f:then>
@@ -202,9 +202,9 @@
                 <f:for each="{parseErrors}" as="parseError">
                     <f:translate key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_objbrowser.xlf:severity.{parseError.1}"/>
                     : {parseError.0}
-                    <f:link.external uri="{showErrorDetailsUri}{parseError.2 + parseError.3}" defaultScheme="" class="text-warning">
+                    <a href="{showErrorDetailsUri}{parseError.2 + parseError.3}"  class="text-warning">
                         <f:translate key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_objbrowser.xlf:errorShowDetails"/>
-                    </f:link.external>
+                    </a>
                     <br/>
                 </f:for>
             </f:be.infobox>
@@ -223,9 +223,9 @@
                 </f:if>
                 <strong>{selectedKey}</strong>
                 <f:if condition="{moduleUrlRemoveFromObjectList}">
-                    <f:link.external uri="{moduleUrlRemoveFromObjectList}" defaultScheme="" class="btn btn-default">
+                    <a href="{moduleUrlRemoveFromObjectList}" class="btn btn-default">
                         <f:translate key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_objbrowser.xlf:removeKey" />
-                    </f:link.external>
+                    </a>
                 </f:if>
             </div>
             <div class="panel-body tstemplate-tsobjectbrowser-content"><f:format.raw>{tsTree}</f:format.raw></div>