diff --git a/web/templates/account/block_list.html b/web/templates/account/block_list.html
index fdb2116..7323e54 100644
--- a/web/templates/account/block_list.html
+++ b/web/templates/account/block_list.html
@@ -57,7 +57,7 @@
 
                                     {{if .IsAdmin}}
                                     <span class="has-text-danger">
-                                        <span class="icon"><i class="fa fa-gavel"></i></span>
+                                        <span class="icon"><i class="fa fa-peace"></i></span>
                                         <span>Admin</span>
                                     </span>
                                     {{end}}
diff --git a/web/templates/account/profile.html b/web/templates/account/profile.html
index 5256cc9..2c2673c 100644
--- a/web/templates/account/profile.html
+++ b/web/templates/account/profile.html
@@ -133,7 +133,7 @@
                             <div class="pt-1">
                                 <div class="icon-text has-text-danger">
                                     <span class="icon">
-                                        <i class="fa fa-gavel"></i>
+                                        <i class="fa fa-peace"></i>
                                     </span>
                                     <strong>Admin</strong>
                                 </div>
@@ -418,7 +418,7 @@
                 <div class="card block">
                     <header class="card-header has-background-danger">
                         <p class="card-header-title has-text-light">
-                            <i class="fa fa-gavel pr-2"></i>
+                            <i class="fa fa-peace pr-2"></i>
                             Admin Actions
                         </p>
                     </header>
@@ -439,7 +439,7 @@
                             </li>
                             <li>
                                 <a href="/admin/user-action?intent=promote&user_id={{.User.ID}}">
-                                    <span class="icon"><i class="fa fa-gavel"></i></span>
+                                    <span class="icon"><i class="fa fa-peace"></i></span>
                                     <span>Add/Remove admin rights</span>
                                 </a>
                             </li>
diff --git a/web/templates/account/search.html b/web/templates/account/search.html
index 630cfeb..2e40380 100644
--- a/web/templates/account/search.html
+++ b/web/templates/account/search.html
@@ -258,7 +258,7 @@
 
                                     {{if .IsAdmin}}
                                     <span class="tag is-danger is-light p-1" style="font-size: x-small">
-                                        <i class="fa fa-gavel mr-1"></i>
+                                        <i class="fa fa-peace mr-1"></i>
                                         <span>Admin</span>
                                     </span>
                                     {{end}}
diff --git a/web/templates/admin/dashboard.html b/web/templates/admin/dashboard.html
index 78f7e6e..4476a6b 100644
--- a/web/templates/admin/dashboard.html
+++ b/web/templates/admin/dashboard.html
@@ -115,7 +115,7 @@
                 <div class="card block">
                     <header class="card-header has-background-link">
                         <p class="card-header-title has-text-light">
-                            <i class="fa fa-gavel mr-2"></i>
+                            <i class="fa fa-peace mr-2"></i>
                             Admin Menu
                         </p>
                     </header>
diff --git a/web/templates/admin/user_actions.html b/web/templates/admin/user_actions.html
index 8c40018..fa62ed2 100644
--- a/web/templates/admin/user_actions.html
+++ b/web/templates/admin/user_actions.html
@@ -26,7 +26,7 @@
                                 <span class="icon"><i class="fa fa-ban"></i></span>
                                 Ban User
                             {{else if eq .Intent "promote"}}
-                                <span class="icon"><i class="fa fa-gavel"></i></span>
+                                <span class="icon"><i class="fa fa-peace"></i></span>
                                 Promote User
                             {{else if eq .Intent "delete"}}
                                 <span class="icon"><i class="fa fa-trash"></i></span>
diff --git a/web/templates/base.html b/web/templates/base.html
index 4785519..855e3c7 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -184,7 +184,7 @@
                             </a>
                             {{if .CurrentUser.IsAdmin}}
                             <a class="navbar-item has-text-danger" href="/admin">
-                                <span class="icon"><i class="fa fa-gavel"></i></span>
+                                <span class="icon"><i class="fa fa-peace"></i></span>
                                 <span>Admin</span>
                                 {{if .NavAdminNotifications}}<span class="nonshy-navbar-notification-tag is-danger ml-1">{{.NavAdminNotifications}}</span>{{end}}
                             </a>
@@ -265,7 +265,7 @@
 
         {{if gt .NavAdminNotifications 0}}
             <a class="tag is-danger py-4" href="/admin">
-                <span class="icon"><i class="fa fa-gavel"></i></span>
+                <span class="icon"><i class="fa fa-peace"></i></span>
                 <small class="nonshy-navbar-notification-count">{{.NavAdminNotifications}}</small>
             </a>
         {{end}}
diff --git a/web/templates/faq.html b/web/templates/faq.html
index a707cbe..3080449 100644
--- a/web/templates/faq.html
+++ b/web/templates/faq.html
@@ -685,7 +685,7 @@
             </li>
             <li>
                 <span class="tag is-warning is-light">
-                    <span class="icon"><i class="fa fa-gavel"></i></span>
+                    <span class="icon"><i class="fa fa-peace"></i></span>
                     <span>Privileged</span>
                 </span> -
                 only a forum's moderators can create new topics in a Privileged forum (such as the
diff --git a/web/templates/forum/add_edit.html b/web/templates/forum/add_edit.html
index a3bc0cc..2645174 100644
--- a/web/templates/forum/add_edit.html
+++ b/web/templates/forum/add_edit.html
@@ -71,7 +71,7 @@
                         <div class="field">
                             <label class="label" for="category">
                                 Category
-                                <i class="fa fa-gavel has-text-danger ml-2" title="Admin Only"></i>
+                                <i class="fa fa-peace has-text-danger ml-2" title="Admin Only"></i>
                             </label>
                             <div class="select is-fullwidth">
                                 <select name="category" id="category">
@@ -106,7 +106,7 @@
                                     name="privileged"
                                     value="true"
                                     {{if and .EditForum .EditForum.Privileged}}checked{{end}}>
-                                Privileged <i class="fa fa-gavel has-text-danger ml-1"></i>
+                                Privileged <i class="fa fa-peace has-text-danger ml-1"></i>
                             </label>
                             <p class="help">
                                 Check this box if only privileged users are allowed to create new threads
diff --git a/web/templates/forum/admin.html b/web/templates/forum/admin.html
index 21cb0a3..7e4d080 100644
--- a/web/templates/forum/admin.html
+++ b/web/templates/forum/admin.html
@@ -5,7 +5,7 @@
         <div class="hero-body">
             <div class="container">
                 <h1 class="title">
-                    <span class="icon mr-4"><i class="fa fa-gavel"></i></span>
+                    <span class="icon mr-4"><i class="fa fa-peace"></i></span>
                     <span>Forum Administration</span>
                 </h1>
             </div>
@@ -42,7 +42,7 @@
                     {{if .Category}}<span class="ml-4">{{.Category}}</span>{{end}}
                     <span class="ml-4">
                         by <strong><a href="/u/{{.Owner.Username}}">{{.Owner.Username}}</a></strong>
-                        {{if .Owner.IsAdmin}}<i class="fa fa-gavel has-text-danger ml-1"></i>{{end}}
+                        {{if .Owner.IsAdmin}}<i class="fa fa-peace has-text-danger ml-1"></i>{{end}}
                     </span>
                 </h2>
 
@@ -75,7 +75,7 @@
 
                     {{if .Privileged}}
                     <div class="tag is-warning is-light">
-                        <span class="icon"><i class="fa fa-gavel"></i></span>
+                        <span class="icon"><i class="fa fa-peace"></i></span>
                         Privileged
                     </div>
                     {{end}}
diff --git a/web/templates/forum/board_index.html b/web/templates/forum/board_index.html
index b75b863..a869dd4 100644
--- a/web/templates/forum/board_index.html
+++ b/web/templates/forum/board_index.html
@@ -47,7 +47,7 @@
 
 {{if .Forum.Privileged}}
 <div class="block p-2 notification is-warning is-light">
-    <i class="fa fa-gavel mr-1"></i>
+    <i class="fa fa-peace mr-1"></i>
     Only moderators may create new threads on this forum. You may be able to reply to threads here.
 </div>
 {{end}}
diff --git a/web/templates/forum/index.html b/web/templates/forum/index.html
index 86ae1a0..4b6f731 100644
--- a/web/templates/forum/index.html
+++ b/web/templates/forum/index.html
@@ -15,7 +15,7 @@
                     <div class="level-right">
                         <div>
                             <a href="/forum/admin" class="button is-small has-text-danger">
-                                <span class="icon"><i class="fa fa-gavel"></i></span>
+                                <span class="icon"><i class="fa fa-peace"></i></span>
                                 <span>Manage Forums</span>
                             </a>
                         </div>
@@ -86,7 +86,7 @@
 
                                 {{if .Privileged}}
                                 <span class="tag is-warning is-light">
-                                    <span class="icon"><i class="fa fa-gavel"></i></span>
+                                    <span class="icon"><i class="fa fa-peace"></i></span>
                                     <span>Privileged</span>
                                 </span>
                                 {{end}}
diff --git a/web/templates/forum/new_post.html b/web/templates/forum/new_post.html
index ae0cd28..a8a79fc 100644
--- a/web/templates/forum/new_post.html
+++ b/web/templates/forum/new_post.html
@@ -242,7 +242,7 @@
                                             name="noreply"
                                             value="true"
                                             {{if .IsNoReply}}checked{{end}}>
-                                        No replies allowed <i class="fa fa-gavel ml-1"></i>
+                                        No replies allowed <i class="fa fa-peace ml-1"></i>
                                     </label>
                                 </div>
                                 {{end}}
diff --git a/web/templates/forum/newest.html b/web/templates/forum/newest.html
index c3fb393..2ffac3b 100644
--- a/web/templates/forum/newest.html
+++ b/web/templates/forum/newest.html
@@ -88,7 +88,7 @@
                             {{.Forum.Title}}
 
                             {{if .Forum.Privileged}}
-                            <small class="has-text-warning-dark fa fa-gavel"></small>
+                            <small class="has-text-warning-dark fa fa-peace"></small>
                             {{end}}
 
                             {{if .Forum.Explicit}}
@@ -185,7 +185,7 @@
 
                                 {{if .Privileged}}
                                 <span class="tag is-warning is-light">
-                                    <span class="icon"><i class="fa fa-gavel"></i></span>
+                                    <span class="icon"><i class="fa fa-peace"></i></span>
                                     <span>Privileged</span>
                                 </span>
                                 {{end}}
diff --git a/web/templates/forum/thread.html b/web/templates/forum/thread.html
index 392250a..419b3b8 100644
--- a/web/templates/forum/thread.html
+++ b/web/templates/forum/thread.html
@@ -115,7 +115,7 @@
                 {{if $c.User.IsAdmin}}
                 <div class="is-size-7 mt-1">
                     <span class="tag is-danger is-light">
-                        <span class="icon"><i class="fa fa-gavel"></i></span>
+                        <span class="icon"><i class="fa fa-peace"></i></span>
                         <span>Admin</span>
                     </span>
                 </div>
diff --git a/web/templates/friend/friends.html b/web/templates/friend/friends.html
index 48e94e3..34a4d37 100644
--- a/web/templates/friend/friends.html
+++ b/web/templates/friend/friends.html
@@ -94,7 +94,7 @@
 
                                     {{if .IsAdmin}}
                                     <span class="has-text-danger">
-                                        <span class="icon"><i class="fa fa-gavel"></i></span>
+                                        <span class="icon"><i class="fa fa-peace"></i></span>
                                         <span>Admin</span>
                                     </span>
                                     {{end}}
diff --git a/web/templates/inbox/inbox.html b/web/templates/inbox/inbox.html
index b07447d..4165acb 100644
--- a/web/templates/inbox/inbox.html
+++ b/web/templates/inbox/inbox.html
@@ -78,7 +78,7 @@
 
                                     {{if $SourceUser.IsAdmin}}
                                     <span class="tag is-danger is-light ml-2 p-1" style="font-size: x-small">
-                                        <i class="fa fa-gavel mr-1"></i>
+                                        <i class="fa fa-peace mr-1"></i>
                                         Admin
                                     </span>
                                     {{end}}
diff --git a/web/templates/photo/gallery.html b/web/templates/photo/gallery.html
index 25c1cfe..1169f35 100644
--- a/web/templates/photo/gallery.html
+++ b/web/templates/photo/gallery.html
@@ -330,7 +330,7 @@
                     <strong>{{.User.Username}}</strong> is a part of the {{PrettyCircle}}.
                     {{if .CurrentUser.IsAdmin}}
                         <a href="/inner-circle/remove?to={{.User.Username}}" class="has-text-danger ml-2">
-                            <i class="fa fa-gavel"></i> Remove from circle?
+                            <i class="fa fa-peace"></i> Remove from circle?
                         </a>
                     {{end}}
                 </div>
diff --git a/web/templates/photo/private.html b/web/templates/photo/private.html
index 22154c6..23a9e12 100644
--- a/web/templates/photo/private.html
+++ b/web/templates/photo/private.html
@@ -103,7 +103,7 @@
 
                                     {{if .IsAdmin}}
                                     <span class="has-text-danger">
-                                        <span class="icon"><i class="fa fa-gavel"></i></span>
+                                        <span class="icon"><i class="fa fa-peace"></i></span>
                                         <span>Admin</span>
                                     </span>
                                     {{end}}