diff --git a/src/client/app/common/views/components/note-header.vue b/src/client/app/common/views/components/note-header.vue
index 012b678ab3..1e457d2d72 100644
--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@@ -14,14 +14,12 @@
 			<mk-time :time="note.createdAt"/>
 		</router-link>
 		<span class="visibility" v-if="note.visibility != 'public'">
-			<template v-if="note.visibility == 'home'"><fa icon="home"/></template>
-			<template v-if="note.visibility == 'followers'"><fa icon="unlock"/></template>
-			<template v-if="note.visibility == 'specified'"><fa icon="envelope"/></template>
-			<template v-if="note.visibility == 'private'"><fa icon="lock"/></template>
-		</span>
-		<span class="localOnly" v-if="note.localOnly == true">
-			<template><fa icon="heart"/></template>
+			<fa v-if="note.visibility == 'home'" icon="home"/>
+			<fa v-if="note.visibility == 'followers'" icon="unlock"/>
+			<fa v-if="note.visibility == 'specified'" icon="envelope"/>
+			<fa v-if="note.visibility == 'private'" icon="lock"/>
 		</span>
+		<span class="localOnly" v-if="note.localOnly == true"><fa icon="heart"/></span>
 	</div>
 </header>
 </template>
diff --git a/src/client/app/desktop/views/components/note.vue b/src/client/app/desktop/views/components/note.vue
index 6bd4674269..86534adc49 100644
--- a/src/client/app/desktop/views/components/note.vue
+++ b/src/client/app/desktop/views/components/note.vue
@@ -21,14 +21,12 @@
 		<span>{{ this.$t('reposted-by').substr(this.$t('reposted-by').indexOf('}') + 1) }}</span>
 		<mk-time :time="note.createdAt"/>
 		<span class="visibility" v-if="note.visibility != 'public'">
-			<template v-if="note.visibility == 'home'"><fa icon="home"/></template>
-			<template v-if="note.visibility == 'followers'"><fa icon="unlock"/></template>
-			<template v-if="note.visibility == 'specified'"><fa icon="envelope"/></template>
-			<template v-if="note.visibility == 'private'"><fa icon="lock"/></template>
-		</span>
-		<span class="localOnly" v-if="note.localOnly == true">
-			<template><fa icon="heart"/></template>
+			<fa v-if="note.visibility == 'home'" icon="home"/>
+			<fa v-if="note.visibility == 'followers'" icon="unlock"/>
+			<fa v-if="note.visibility == 'specified'" icon="envelope"/>
+			<fa v-if="note.visibility == 'private'" icon="lock"/>
 		</span>
+		<span class="localOnly" v-if="note.localOnly == true"><fa icon="heart"/></span>
 	</div>
 	<article>
 		<mk-avatar class="avatar" :user="appearNote.user"/>
diff --git a/src/client/app/desktop/views/pages/deck/deck.tl-column.vue b/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
index c962dd0ec8..97d69ae888 100644
--- a/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
@@ -1,12 +1,12 @@
 <template>
 <x-column :menu="menu" :name="name" :column="column" :is-stacked="isStacked">
 	<span slot="header">
-		<template v-if="column.type == 'home'"><fa icon="home"/></template>
-		<template v-if="column.type == 'local'"><fa :icon="['far', 'comments']"/></template>
-		<template v-if="column.type == 'hybrid'"><fa icon="share-alt"/></template>
-		<template v-if="column.type == 'global'"><fa icon="globe"/></template>
-		<template v-if="column.type == 'list'"><fa icon="list"/></template>
-		<template v-if="column.type == 'hashtag'"><fa icon="hashtag"/></template>
+		<fa v-if="column.type == 'home'" icon="home"/>
+		<fa v-if="column.type == 'local'" :icon="['far', 'comments']"/>
+		<fa v-if="column.type == 'hybrid'" icon="share-alt"/>
+		<fa v-if="column.type == 'global'" icon="globe"/>
+		<fa v-if="column.type == 'list'" icon="list"/>
+		<fa v-if="column.type == 'hashtag'" icon="hashtag"/>
 		<span>{{ name }}</span>
 	</span>