diff --git a/addons/core/translations/actions/en-us.yaml b/addons/core/translations/actions/en-us.yaml
index dd00b107b..49bde4799 100644
--- a/addons/core/translations/actions/en-us.yaml
+++ b/addons/core/translations/actions/en-us.yaml
@@ -33,3 +33,4 @@ edit-form: Edit Form
 change-origin: Change Origin URL
 change-state: Change State
 close: Close
+toggle-secret: Toggle secret visibility
diff --git a/ui/desktop/app/components/hidden-secret/index.hbs b/ui/desktop/app/components/hidden-secret/index.hbs
index 8b5cc1cac..6660a77e5 100644
--- a/ui/desktop/app/components/hidden-secret/index.hbs
+++ b/ui/desktop/app/components/hidden-secret/index.hbs
@@ -1,9 +1,11 @@
 <div class='hidden-secret'>
-  <Rose::Icon
-    @name={{if this.isHidden 'visibility-show' 'visibility-hide'}}
-    @size='medium'
+  <Rose::Button
+    @style='ghost'
+    @iconOnly={{if this.isHidden 'visibility-show' 'visibility-hide'}}
     {{on 'click' this.toggleSecretVisibility}}
-  />
+  >
+    {{t 'actions.toggle-secret'}}
+  </Rose::Button>
   <Copyable
     @text={{@secret}}
     @buttonText={{t 'actions.copy-to-clipboard'}}
@@ -12,7 +14,7 @@
     {{#if this.isHidden}}
       {{@secret}}
     {{else}}
-      {{this.textMask}}
+      <span class='secret-mask'>{{this.textMask}}</span>
     {{/if}}
   </Copyable>
 </div>
\ No newline at end of file
diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index f65623c56..617f09ea5 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -478,20 +478,22 @@ $chevron-down: url("data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%231
 .hidden-secret {
   display: flex;
   align-items: center;
-  color: var(--ui-gray-subtler-2);
-
-  .rose-icon {
-    margin-top: sizing.rems(xxxs);
-    margin-right: sizing.rems(s);
-  }
 
   .copyable {
     display: flex;
     width: 100%;
     justify-content: space-between;
+
+    .secret-mask {
+      color: var(--ui-gray-subtler-2);
+    }
+
+    .rose-button-ghost { // Copyable button icon.
+      color: var(--ui-gray-subtler-1);
+    }
   }
 
-  .rose-button-ghost {
-    color: var(--ui-gray-subtler-1);
+  .rose-button-ghost { // Hide/Show secret button icon.
+    color: var(--ui-gray);
   }
 }