diff --git a/packages/core/src/components/BaseInput/BaseInput.module.scss b/packages/core/src/components/BaseInput/BaseInput.module.scss
index 3a2c6e97bd..14198f43ec 100644
--- a/packages/core/src/components/BaseInput/BaseInput.module.scss
+++ b/packages/core/src/components/BaseInput/BaseInput.module.scss
@@ -6,7 +6,6 @@
   position: relative;
   display: flex;
   align-items: center;
-  flex-shrink: 0;
   gap: var(--spacing-small);
   padding-block: var(--spacing-xs);
   padding-inline: var(--spacing-medium) var(--spacing-xs);
@@ -22,15 +21,18 @@
   transition: border-color var(--motion-productive-medium) ease-in;
 
   &.small {
+    min-height: 32px;
     height: 32px;
     @include vibe-text(text2, normal);
   }
 
   &.medium {
+    min-height: 40px;
     height: 40px;
   }
 
   &.large {
+    min-height: 48px;
     height: 48px;
     padding-block: var(--spacing-small);
   }
diff --git a/packages/core/src/components/Search/Search.module.scss b/packages/core/src/components/Search/Search.module.scss
index ee3624807b..e3c71bd991 100644
--- a/packages/core/src/components/Search/Search.module.scss
+++ b/packages/core/src/components/Search/Search.module.scss
@@ -14,7 +14,7 @@
 
   .icon {
     opacity: 1;
-    color: inherit;
+    color: var(--icon-color);
     transition: opacity var(--motion-productive-short);
 
     &.empty {