diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/password/password.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/password/password.component.html
index 8f4247155c..195b46c96d 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/password/password.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/password/password.component.html
@@ -1,20 +1,24 @@
 <div class="input-group">
-  <div class="col-9 col-md-10 p-0">
-    <input
-      [type]="fieldTextType ? 'text' : 'password'"
-      class="form-control"
-      [id]="prop.id"
-      [formControlName]="prop.name"
-    />
+  <div class="row w-100">
+    <div class="col-11 pe-0">
+      <input
+        [type]="fieldTextType ? 'text' : 'password'"
+        class="form-control"
+        [id]="prop.id"
+        [formControlName]="prop.name"
+      />
+    </div>
+    <div class="col-1 ps-0">
+      <button class="btn btn-secondary" type="button">
+        <i
+          class="fa"
+          [ngClass]="{
+            'fa-eye-slash': !fieldTextType,
+            'fa-eye': fieldTextType
+          }"
+          (click)="toggleFieldTextType()"
+        ></i>
+      </button>
+    </div>
   </div>
-  <span class="input-group-text">
-    <i
-      class="fa"
-      [ngClass]="{
-        'fa-eye-slash': !fieldTextType,
-        'fa-eye': fieldTextType
-      }"
-      (click)="toggleFieldTextType()"
-    ></i>
-  </span>
 </div>