diff --git a/src/components/Global/InputPasswordToggle.vue b/src/components/Global/InputPasswordToggle.vue
index 6ac9863..228746c 100644
--- a/src/components/Global/InputPasswordToggle.vue
+++ b/src/components/Global/InputPasswordToggle.vue
@@ -4,6 +4,7 @@
     <b-button
       :aria-label="$t('global.ariaLabel.showPassword')"
       variant="link"
+      class="input-action-btn"
       :class="{ isVisible: isVisible }"
       @click="toggleVisibility"
     >
@@ -52,15 +53,4 @@
 .input-password-toggle-container {
   position: relative;
 }
-
-.btn {
-  position: absolute;
-  right: 0;
-  top: 0;
-  padding: 0.4rem 1rem;
-  svg {
-    margin-left: 0;
-    vertical-align: sub;
-  }
-}
 </style>
diff --git a/src/components/Global/TableDateFilter.vue b/src/components/Global/TableDateFilter.vue
index e198e92..c0008de 100644
--- a/src/components/Global/TableDateFilter.vue
+++ b/src/components/Global/TableDateFilter.vue
@@ -26,9 +26,9 @@
           <template slot:append>
             <b-form-datepicker
               v-model="fromDate"
+              class="input-action"
               button-only
               right
-              size="sm"
               :max="toDate"
               :hide-header="true"
               :locale="locale"
@@ -76,9 +76,9 @@
           <template slot:append>
             <b-form-datepicker
               v-model="toDate"
+              class="input-action"
               button-only
               right
-              size="sm"
               :min="fromDate"
               :hide-header="true"
               :locale="locale"