diff --git a/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.hbs b/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.hbs
index 3d40670..618d55a 100644
--- a/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.hbs
+++ b/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.hbs
@@ -8,11 +8,11 @@
       <img
         src={{this.emojiUrl}}
         title={{this.userNotesTitle}}
-        alt="pencil"
+        alt=""
         class="emoji"
       />
     {{else}}
-      {{d-icon "note-sticky"}}
+      {{d-icon "pen-to-square"}}
     {{/if}}
   </DButton>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.js b/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.js
index 58b1626..ccc01db 100644
--- a/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.js
+++ b/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.js
@@ -15,7 +15,7 @@ export default {
     component.setProperties({
       userNotesCount,
       emojiEnabled: component.siteSettings.enable_emoji,
-      emojiUrl: emojiUrlFor("pencil"),
+      emojiUrl: emojiUrlFor("memo"),
       userNotesTitle: i18n("user_notes.show", { count: userNotesCount }),
     });
   },
diff --git a/assets/javascripts/discourse-user-notes/connectors/user-card-post-names/show-user-notes-on-card.gjs b/assets/javascripts/discourse-user-notes/connectors/user-card-post-names/show-user-notes-on-card.gjs
index 8ee56fe..82d1b4f 100644
--- a/assets/javascripts/discourse-user-notes/connectors/user-card-post-names/show-user-notes-on-card.gjs
+++ b/assets/javascripts/discourse-user-notes/connectors/user-card-post-names/show-user-notes-on-card.gjs
@@ -43,9 +43,9 @@ export default class extends Component {
           class="btn-flat"
         >
           {{#if this.siteSettings.enable_emoji}}
-            {{emoji "pencil"}}
+            {{emoji "memo"}}
           {{else}}
-            {{icon "note-sticky"}}
+            {{icon "pen-to-square"}}
           {{/if}}
         </DButton>
       {{/if}}
diff --git a/assets/javascripts/discourse/components/show-user-notes.hbs b/assets/javascripts/discourse/components/show-user-notes.hbs
index b1246ec..b80a20f 100644
--- a/assets/javascripts/discourse/components/show-user-notes.hbs
+++ b/assets/javascripts/discourse/components/show-user-notes.hbs
@@ -1,6 +1,6 @@
 <DButton
   class="btn-default show-user-notes-btn"
   @action={{@show}}
-  @icon="pencil"
+  @icon="pen-to-square"
   @translatedLabel={{this.label}}
 />
\ No newline at end of file
diff --git a/assets/javascripts/discourse/initializers/enable-user-notes.js b/assets/javascripts/discourse/initializers/enable-user-notes.js
index 875cec0..9922394 100644
--- a/assets/javascripts/discourse/initializers/enable-user-notes.js
+++ b/assets/javascripts/discourse/initializers/enable-user-notes.js
@@ -70,7 +70,7 @@ export default {
       });
       api.addPostAdminMenuButton((attrs) => {
         return {
-          icon: "pencil",
+          icon: "pen-to-square",
           label: "user_notes.attach",
           action: (post) => {
             showUserNotes(
@@ -103,9 +103,9 @@ export default {
 
         html() {
           if (this.siteSettings.enable_emoji) {
-            return this.attach("emoji", { name: "pencil" });
+            return this.attach("emoji", { name: "memo" });
           } else {
-            return iconNode("note-sticky");
+            return iconNode("pen-to-square");
           }
         },
       });
diff --git a/plugin.rb b/plugin.rb
index 190f64e..c9787f2 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -11,7 +11,7 @@
 
 register_asset "stylesheets/user_notes.scss"
 
-register_svg_icon "note-sticky"
+register_svg_icon "pen-to-square"
 
 after_initialize do
   require_dependency "user"