diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index 0d7deeb..5fd9780 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -2,7 +2,8 @@
   .flex.flex-col.gap-y-2
     .label.font-semibold.text-sm.opacity-40(
       v-if="label",
-      :class="labelClass"
+      :class="labelClass",
+      :style="{color: 'var(--font-black-color)'}"
     ) {{ label }}
     q-input(
       v-model="value",
@@ -19,22 +20,7 @@
       hide-bottom-space,
       autogrow
     )
-      .flex.items-center(:v-if="withIcon")
-        slot.cursor-pointer
-   
-    //- slot(name='icon')
-    //- .input-wrapper.flex.gap-x-2.px-4.box-border.py-10px(
-    //-   :class="{'border-none': borderNone, 'border-error': borderError }"
-    //-   :style="disabledBackgroundStyle"
-    //- )
-    //-   input.input.w-full.outline-0.not-italic(
-    //-     v-model="value",
-    //-     :class="textClass",
-    //-     :placeholder="placeholder",
-    //-     :disabled="disabled",
-    //-     :type="type"
-    //-   )
-    //-   slot(name='icon')
+      slot.cursor-pointer
 </template>
 
 <script>
@@ -56,16 +42,11 @@ export default {
     type: {
       default: "text",
     },
-    withIcon: {
-      type: Boolean,
-      default: false,
-    },
     mask: String,
     maxLength: String,
     rule: Array,
     modelValue: String,
     placeholder: String,
-    borderNone: Boolean,
     disabled: Boolean,
     label: String,
     textStyle: String,
@@ -99,32 +80,6 @@ export default {
             "text-sm": true,
           };
     },
-    disabledBackgroundStyle() {
-      return this.disabled
-        ? {
-            "background-color": "var(--bg-disable-grey-color)",
-          }
-        : false;
-    },
   },
 };
 </script>
-
-<style lang="sass" scoped>
-//TODO: Вынести grey borders в taiwindConfig
-.input-wrapper
-  border: 1.5px solid var(--border-light-grey-color)
-  border-radius: 4px
-  background-color: var(--default-white)
-  color: var(--font-black-color)
-  height: 40px
-
-.input
-  background-color: inherit
-  &:disabled, &[disabled]
-    background-color: var(--bg-disable-grey-color)
-    color: var(--font-grey-color-0)
-
-.label
-  color: var(--font-black-color)
-</style>
diff --git a/src/pages/clients/components/ClientsTableHat.vue b/src/pages/clients/components/ClientsTableHat.vue
index a0aa22e..5bbb8f9 100644
--- a/src/pages/clients/components/ClientsTableHat.vue
+++ b/src/pages/clients/components/ClientsTableHat.vue
@@ -9,7 +9,8 @@
           placeholder="Введите фамилию",
           @keyup.enter="searchLastName"
         )
-          .icon-search
+          .flex.items-center.cursor-pointer
+            .icon-search
       base-button.font-semibold(
         v-if="createdClientName === ''",
         @click="searchLastName",
diff --git a/src/pages/login/TheLogin.vue b/src/pages/login/TheLogin.vue
index 7ce87aa..7addb8a 100644
--- a/src/pages/login/TheLogin.vue
+++ b/src/pages/login/TheLogin.vue
@@ -24,11 +24,12 @@
             label="Пароль",
             withIcon
           )
-            q-icon(
-              v-if="!wrongData && user.password"
-              :name="isView ? 'visibility_off' : 'visibility'",
-              @click="changeView"
-            )
+            .flex.items-center.cursor-pointer
+              q-icon(
+                v-if="!wrongData && user.password"
+                :name="isView ? 'visibility_off' : 'visibility'",
+                @click="changeView"
+              )
           span.font-medium(:style="{color: this.redColor}", v-show="wrongData") Неверный логин или пароль
           .flex.items-center.gap-x-11px
             input.w-4.h-4.checkbox.cursor-pointer(@click="persist", type="checkbox")