diff --git a/ui/app/templates/components/auth-info.hbs b/ui/app/templates/components/auth-info.hbs
index 176bd239b..bd7c1b2e9 100644
--- a/ui/app/templates/components/auth-info.hbs
+++ b/ui/app/templates/components/auth-info.hbs
@@ -34,6 +34,16 @@
                 Revoke token
               {{/confirm-action}}
             </li>
+            <li class="action">
+              <CopyButton
+                @clipboardText={{auth.currentToken}}
+                class="link button"
+                @buttonType="button"
+                @success={{action (set-flash-message 'Token copied!')}}
+              >
+                Copy token
+              </CopyButton>
+            </li>
           {{else}}
             <li class="action text-right">
               {{#confirm-action
@@ -50,6 +60,16 @@
                 Revoke token
               {{/confirm-action}}
             </li>
+            <li class="action">
+              <CopyButton
+                @clipboardText={{auth.currentToken}}
+                class="link button"
+                @buttonType="button"
+                @success={{action (set-flash-message 'Token copied!')}}
+              >
+                Copy token
+              </CopyButton>
+            </li>
           {{/if}}
         {{/if}}
         <li class="action">
diff --git a/ui/app/templates/components/status-menu.hbs b/ui/app/templates/components/status-menu.hbs
index 2efca7a9b..a0fa73076 100644
--- a/ui/app/templates/components/status-menu.hbs
+++ b/ui/app/templates/components/status-menu.hbs
@@ -1,10 +1,6 @@
 {{#basic-dropdown-hover horizontalPosition="auto-left" verticalPosition="below" renderInPlace=media.isMobile as |d|}}
   {{#d.trigger tagName=(if (eq type "replication") "span" "button") class=(if (eq type "replication") "" "button is-transparent")}}
-    {{i-con
-      glyph=glyphName
-      size=24
-      aria-label=ariaLabel
-    }}
+    <ICon @glyph={{glyphName}} @size=24 @aria-label={{ariaLabel}} />
     <div class="status-menu-label">
       {{label}}
     </div>