diff --git a/src/views/AccessControl/Ldap/Ldap.vue b/src/views/AccessControl/Ldap/Ldap.vue
index 8bebed9..618434b 100644
--- a/src/views/AccessControl/Ldap/Ldap.vue
+++ b/src/views/AccessControl/Ldap/Ldap.vue
@@ -146,6 +146,7 @@
                             v-model="form.bindPassword"
                             type="password"
                             :state="getValidationState($v.form.bindPassword)"
+                            class="form-control-with-button"
                             @change="$v.form.bindPassword.$touch()"
                           />
                           <b-form-invalid-feedback role="alert">
diff --git a/src/views/AccessControl/LocalUserManagement/ModalUser.vue b/src/views/AccessControl/LocalUserManagement/ModalUser.vue
index 75961e3..7e6519d 100644
--- a/src/views/AccessControl/LocalUserManagement/ModalUser.vue
+++ b/src/views/AccessControl/LocalUserManagement/ModalUser.vue
@@ -143,6 +143,7 @@
                   data-test-id="localUserManagement-input-password"
                   aria-describedby="password-help-block"
                   :state="getValidationState($v.form.password)"
+                  class="form-control-with-button"
                   @input="$v.form.password.$touch()"
                 />
                 <b-form-invalid-feedback role="alert">
@@ -178,6 +179,7 @@
                   data-test-id="localUserManagement-input-passwordConfirmation"
                   type="password"
                   :state="getValidationState($v.form.passwordConfirmation)"
+                  class="form-control-with-button"
                   @input="$v.form.passwordConfirmation.$touch()"
                 />
                 <b-form-invalid-feedback role="alert">
diff --git a/src/views/ChangePassword/ChangePassword.vue b/src/views/ChangePassword/ChangePassword.vue
index b2edcd4..fbf95d9 100644
--- a/src/views/ChangePassword/ChangePassword.vue
+++ b/src/views/ChangePassword/ChangePassword.vue
@@ -22,6 +22,7 @@
             autofocus="autofocus"
             type="password"
             :state="getValidationState($v.form.password)"
+            class="form-control-with-button"
             @change="$v.form.password.$touch()"
           >
           </b-form-input>
@@ -42,6 +43,7 @@
             v-model="form.passwordConfirm"
             type="password"
             :state="getValidationState($v.form.passwordConfirm)"
+            class="form-control-with-button"
             @change="$v.form.passwordConfirm.$touch()"
           >
           </b-form-input>
diff --git a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue b/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
index e10c9ea..b6bc815 100644
--- a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
+++ b/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
@@ -60,6 +60,7 @@
                     :state="getValidationState($v.form.manual.date)"
                     :disabled="form.configurationSelected === 'ntp'"
                     data-test-id="dateTimeSettings-input-manualDate"
+                    class="form-control-with-button"
                     @blur="$v.form.manual.date.$touch()"
                   />
                   <b-form-invalid-feedback role="alert">
@@ -400,12 +401,3 @@
   }
 };
 </script>
-
-<style lang="scss" scoped>
-.b-form-datepicker {
-  position: absolute;
-  right: 0;
-  top: 0;
-  z-index: $zindex-dropdown + 1;
-}
-</style>
diff --git a/src/views/ProfileSettings/ProfileSettings.vue b/src/views/ProfileSettings/ProfileSettings.vue
index dee8d39..8c68839 100644
--- a/src/views/ProfileSettings/ProfileSettings.vue
+++ b/src/views/ProfileSettings/ProfileSettings.vue
@@ -44,6 +44,7 @@
                   aria-describedby="password-help-block"
                   :state="getValidationState($v.form.newPassword)"
                   data-test-id="profileSettings-input-newPassword"
+                  class="form-control-with-button"
                   @input="$v.form.newPassword.$touch()"
                 />
                 <b-form-invalid-feedback role="alert">
@@ -75,6 +76,7 @@
                   type="password"
                   :state="getValidationState($v.form.confirmPassword)"
                   data-test-id="profileSettings-input-confirmPassword"
+                  class="form-control-with-button"
                   @input="$v.form.confirmPassword.$touch()"
                 />
                 <b-form-invalid-feedback role="alert">