diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index e6c5cf257..e182bbc85 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -333,7 +333,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "admin.auths.delete_auth_title"}}
 	</div>
 	<div class="content">
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 51e329e03..df38831b6 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -72,7 +72,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "repo.settings.delete"}}
 	</div>
 	<div class="content">
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 95323a97b..66f3c9671 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -123,7 +123,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.delete_account_title"}}
 	</div>
 	<div class="content">
diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
index a889c67e5..7a0760b12 100644
--- a/templates/base/delete_modal_actions.tmpl
+++ b/templates/base/delete_modal_actions.tmpl
@@ -1,10 +1,10 @@
 <div class="actions">
 	<div class="ui red basic inverted cancel button">
-		<i class="remove icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "modal.no"}}
 	</div>
 	<div class="ui green basic inverted ok button">
-		<i class="checkmark icon"></i>
+		{{svg "octicon-check"}}
 		{{.i18n.Tr "modal.yes"}}
 	</div>
 </div>
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index ddd4f2364..f0d8a6f5a 100644
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -5,10 +5,10 @@
 		</div>
 		<div class="ui right links">
 			{{if .ShowFooterBranding}}
-				<a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea"><i class="fa fa-github-square"></i><span class="sr-only">GitHub</span></a>
+				<a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea">{{svg "octicon-mark-github"}}<span class="sr-only">GitHub</span></a>
 			{{end}}
 			<div class="ui language bottom floating slide up dropdown link item">
-				<i class="world icon"></i>
+				{{svg "octicon-globe"}}
 				<div class="text">{{.LangName}}</div>
 				<div class="menu language-menu">
 					{{range .AllLangs}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 54d60f93f..a8d42b547 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -32,7 +32,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "org.settings.delete_org_title"}}
 	</div>
 	<div class="content">
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 228f86824..eeb9b1186 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -116,7 +116,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "org.teams.delete_team_title"}}
 	</div>
 	<div class="content">
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index de39fee2e..16418b474 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -66,7 +66,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "org.teams.remove_all_repos_title"}}
 	</div>
 	<div class="content">
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 51ddf6c1e..4f184397d 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -131,7 +131,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "repo.branch.delete_html"}} <span class="name"></span>
 	</div>
 	<div class="content">
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 4ffa20ef1..54ef58422 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -1,6 +1,6 @@
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "repo.issues.label_deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index bb42a9c73..bc88d1015 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -95,7 +95,7 @@
 {{if or .CanWriteIssues .CanWritePulls}}
 	<div class="ui small basic delete modal">
 		<div class="ui icon header">
-			<i class="trash icon"></i>
+			{{svg "octicon-trashcan"}}
 			{{.i18n.Tr "repo.milestones.deletion"}}
 		</div>
 		<div class="content">
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 190f5117b..0ddea1681 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -219,7 +219,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "repo.branch.delete" .HeadTarget }}
 	</div>
 	<div class="content">
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 8a89f2b20..3a1fcf3e8 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -611,7 +611,7 @@
 
 	<div class="ui basic modal remove-dependency">
 		<div class="ui icon header">
-			<i class="trash icon"></i>
+			{{svg "octicon-trashcan"}}
 			{{.i18n.Tr "repo.issues.dependency.remove_header"}}
 		</div>
 		<div class="content">
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 715144268..3974cd3dd 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -78,7 +78,7 @@
 {{if or .CanWriteIssues .CanWritePulls}}
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "repo.projects.deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 8d94970bf..963d0dcde 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -99,7 +99,7 @@
 {{if .PageIsEditRelease}}
 	<div class="ui small basic delete modal">
 		<div class="ui icon header">
-			<i class="trash icon"></i>
+			{{svg "octicon-trashcan"}}
 			{{.i18n.Tr "repo.release.deletion"}}
 		</div>
 		<div class="content">
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 906185704..13030fe86 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -114,7 +114,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "repo.settings.collaborator_deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 15d861d74..d6fb87bb8 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -82,7 +82,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "repo.settings.deploy_key_deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index 2a2a7c8da..f775228ce 100644
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -1,6 +1,6 @@
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "repo.settings.webhook_deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 3d29cdcc5..7252093fb 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -101,7 +101,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "repo.wiki.delete_page_button"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 113e03cd9..1a978a6c2 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -194,7 +194,7 @@
 
 <div class="ui small basic delete modal" id="delete-email">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.email_deletion"}}
 	</div>
 	<div class="content">
@@ -205,7 +205,7 @@
 
 <div class="ui small basic delete modal" id="delete-account">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.delete_account_title"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index b2751ae13..56f78d8e6 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -55,7 +55,7 @@
 
 <div class="ui small basic delete modal" id="delete-token">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.access_token_deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/applications_oauth2.tmpl b/templates/user/settings/applications_oauth2.tmpl
index 42d1950f9..65b9da495 100644
--- a/templates/user/settings/applications_oauth2.tmpl
+++ b/templates/user/settings/applications_oauth2.tmpl
@@ -48,7 +48,7 @@
 
 <div class="ui small basic delete modal" id="remove-gitea-oauth2-application">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.remove_oauth2_application"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index c978ad5c2..495f8ec16 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -57,7 +57,7 @@
 
 <div class="ui small basic delete modal" id="delete-oauth2-application">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.remove_oauth2_application"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 5cde1d214..91658a15e 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -59,7 +59,7 @@
 
 <div class="ui small basic delete modal" id="delete-gpg">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.gpg_key_deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index c163263ea..26204b5b9 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -56,7 +56,7 @@
 
 	<div class="ui small basic delete modal" id="delete-principal">
 		<div class="ui icon header">
-			<i class="trash icon"></i>
+			{{svg "octicon-trashcan"}}
 			{{.i18n.Tr "settings.ssh_principal_deletion"}}
 		</div>
 		<div class="content">
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 3d41f3359..9a4db09c2 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -63,7 +63,7 @@
 
 <div class="ui small basic delete modal" id="delete-ssh">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.ssh_key_deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 456647d9b..a9d029a2b 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -142,7 +142,7 @@
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.remove_account_link"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/security_accountlinks.tmpl b/templates/user/settings/security_accountlinks.tmpl
index 057a0f9af..ba3962836 100644
--- a/templates/user/settings/security_accountlinks.tmpl
+++ b/templates/user/settings/security_accountlinks.tmpl
@@ -26,7 +26,7 @@
 
 <div class="ui small basic delete modal" id="delete-account-link">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.remove_account_link"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/security_openid.tmpl b/templates/user/settings/security_openid.tmpl
index a16501acf..72442d45e 100644
--- a/templates/user/settings/security_openid.tmpl
+++ b/templates/user/settings/security_openid.tmpl
@@ -53,7 +53,7 @@
 
 <div class="ui small basic delete modal" id="delete-openid">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.openid_deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/security_twofa.tmpl b/templates/user/settings/security_twofa.tmpl
index 138872d31..c877aebc3 100644
--- a/templates/user/settings/security_twofa.tmpl
+++ b/templates/user/settings/security_twofa.tmpl
@@ -25,7 +25,7 @@
 
 <div class="ui small basic delete modal" id="disable-twofa">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 		{{.i18n.Tr "settings.twofa_disable"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/security_u2f.tmpl b/templates/user/settings/security_u2f.tmpl
index 5fb5f344d..41bec78b7 100644
--- a/templates/user/settings/security_u2f.tmpl
+++ b/templates/user/settings/security_u2f.tmpl
@@ -45,7 +45,7 @@
 
 <div class="ui small basic delete modal" id="delete-registration">
 	<div class="ui icon header">
-		<i class="trash icon"></i>
+		{{svg "octicon-trashcan"}}
 	{{.i18n.Tr "settings.u2f_delete_key"}}
 	</div>
 	<div class="content">
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index 81111d82f..fdaa3c181 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -679,6 +679,23 @@ code,
       }
     }
   }
+
+  /* modal svg icons, copied from fomantic except width and height */
+  &.icon.header svg {
+    width: 3em;
+    height: 3em;
+    float: none;
+    display: block;
+    line-height: 1;
+    padding: 0;
+    margin: 0 auto .5rem;
+    opacity: 1;
+  }
+
+  /* center text in fomantic modal dialogs */
+  &.modal > .content {
+    text-align: center;
+  }
 }
 
 .file-comment {