diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index 0391a762f..c8651761e 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -77,7 +77,7 @@
 
 <div class="ui small basic addall modal">
 	<div class="ui icon header">
-		<i class="globe icon"></i>
+		{{svg "octicon-globe"}}
 		{{.locale.Tr "org.teams.add_all_repos_title"}}
 	</div>
 	<div class="content">
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index 431033e18..19c5cb007 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -58,7 +58,7 @@
 
 	<div class="ui small basic modal" id="edit-empty-content-modal">
 		<div class="ui icon header">
-			<i class="file icon"></i>
+			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
 		</div>
 		<div class="center content">
@@ -66,11 +66,11 @@
 		</div>
 		<div class="actions">
 			<button class="ui red basic cancel inverted button">
-				<i class="remove icon"></i>
+				{{svg "octicon-x"}}
 				{{.locale.Tr "repo.editor.cancel"}}
 			</button>
 			<button class="ui green basic ok inverted button">
-				<i class="save icon"></i>
+				{{svg "fontawesome-save"}}
 				{{.locale.Tr "repo.editor.commit_changes"}}
 			</button>
 		</div>
diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl
index 75a8b5d68..97637027b 100644
--- a/templates/repo/editor/patch.tmpl
+++ b/templates/repo/editor/patch.tmpl
@@ -38,7 +38,7 @@
 
 	<div class="ui small basic modal" id="edit-empty-content-modal">
 		<div class="ui icon header">
-			<i class="file icon"></i>
+			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
 		</div>
 		<div class="center content">
diff --git a/templates/user/auth/webauthn.tmpl b/templates/user/auth/webauthn.tmpl
index 304d199da..ea773d256 100644
--- a/templates/user/auth/webauthn.tmpl
+++ b/templates/user/auth/webauthn.tmpl
@@ -6,7 +6,7 @@
 				{{.locale.Tr "twofa"}}
 				</h3>
 				<div class="ui attached segment">
-					<i class="huge key icon"></i>
+					{{svg "octicon-key" 56}}
 					<h3>{{.locale.Tr "webauthn_insert_key"}}</h3>
 					{{template "base/alert" .}}
 					<p>{{.locale.Tr "webauthn_sign_in"}}</p>