diff --git a/css/style.scss b/css/style.scss
index 23d182454..85d020d71 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -1338,7 +1338,6 @@ input.input-inline {
 	.icon {
 		display: inline-block;
 		background-size: contain;
-		margin: -3px;
 		margin-right: 5px;
 		opacity: 0.5;
 	}
diff --git a/templates/main.php b/templates/main.php
index 288c518c6..87092f1a7 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -24,7 +24,9 @@
 use OCP\Util;
 
 Util::addScript('activity', 'richObjectStringParser');
-Util::addScript('activity', 'templates');
+if (\OC_Util::getVersion()[0] > 14) {
+	Util::addScript('activity', 'templates');
+}
 Util::addScript('activity', 'script');
 
 Util::addStyle('activity', 'style');
diff --git a/templates/part.card.php b/templates/part.card.php
index c566b370f..ea6a26dfc 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -86,9 +86,9 @@
 
 	<div class="section-header-tabbed">
 		<ul class="tabHeaders ng-scope">
-			<li class="tabHeader" ng-class="{'selected': (params.tab==0 || !params.tab)}" ui-sref="{tab: 0}"><a><span class="icon icon-description"></span><?php p($l->t('Description')); ?></a></li>
-			<li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><a><span class="icon icon-files-dark"></span><?php p($l->t('Attachments')); ?></a></li>
-			<li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}" ng-if="isTimelineEnabled()"><a><span class="icon icon-activity"></span><?php p($l->t('Timeline')); ?></a></li>
+			<li class="tabHeader" ng-class="{'selected': (params.tab==0 || !params.tab)}" ui-sref="{tab: 0}"><span class="icon icon-description"></span><a><?php p($l->t('Description')); ?></a></li>
+			<li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><span class="icon icon-files-dark"></span><a><?php p($l->t('Attachments')); ?></a></li>
+			<li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}" ng-if="isTimelineEnabled()"><span class="icon icon-activity"></span><a><?php p($l->t('Timeline')); ?></a></li>
 		</ul>
 	</div>
 	<div class="tabDetails" style="display: flex;">