diff --git a/changes/issue-9025-restore-correct-icon-alignment-on-input b/changes/issue-9025-restore-correct-icon-alignment-on-input
new file mode 100644
index 0000000000..89f763bd97
--- /dev/null
+++ b/changes/issue-9025-restore-correct-icon-alignment-on-input
@@ -0,0 +1,2 @@
+- Fixed the alignment of the "copy" and "show" button icons in the manage enroll secrets and get API
+  token modals
diff --git a/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/_styles.scss b/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/_styles.scss
index f09e81ca72..7ac3b0b149 100644
--- a/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/_styles.scss
+++ b/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/_styles.scss
@@ -17,6 +17,7 @@
       margin-bottom: 0;
       width: 500px;
       height: 0;
+      min-height: 0;
     }
 
     .input-field {
diff --git a/frontend/components/EnrollSecrets/SecretField/_styles.scss b/frontend/components/EnrollSecrets/SecretField/_styles.scss
index dadfe1273e..8640b5815b 100644
--- a/frontend/components/EnrollSecrets/SecretField/_styles.scss
+++ b/frontend/components/EnrollSecrets/SecretField/_styles.scss
@@ -8,6 +8,8 @@
       font-weight: $bold;
       margin-top: $pad-small;
       width: 100%;
+      height: 0;
+      min-height: 0;
     }
 
     .input-field {