diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index ad7d61a1798..2ae0a487bed 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -40,14 +40,14 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
   if (currentUser.staff) {
     if (attrs.noticeType) {
       contents.push({
-        icon: "asterisk",
+        icon: "user-shield",
         label: "post.controls.remove_post_notice",
         action: "removeNotice",
         className: "btn-default remove-notice"
       });
     } else {
       contents.push({
-        icon: "asterisk",
+        icon: "user-shield",
         label: "post.controls.add_post_notice",
         action: "addNotice",
         className: "btn-default add-notice"
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 65f17c12f1b..35b86f4aace 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -453,7 +453,7 @@ createWidget("post-notice", {
         : attrs.name;
     let text, icon;
     if (attrs.noticeType === "custom") {
-      icon = "asterisk";
+      icon = "user-shield";
       text = attrs.noticeMessage;
     } else if (attrs.noticeType === "new_user") {
       icon = "hands-helping";
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index a76506b3026..88eec160f33 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -20,7 +20,6 @@ module SvgSprite
     "arrow-up",
     "arrows-alt-h",
     "arrows-alt-v",
-    "asterisk",
     "at",
     "backward",
     "ban",
@@ -185,6 +184,7 @@ module SvgSprite
     "user-edit",
     "user-plus",
     "user-secret",
+    "user-shield",
     "user-times",
     "users",
     "wrench"