diff --git a/frontends/web/src/routes/account/account.module.css b/frontends/web/src/routes/account/account.module.css
index 10c0872019..7ad4e9e7f9 100644
--- a/frontends/web/src/routes/account/account.module.css
+++ b/frontends/web/src/routes/account/account.module.css
@@ -187,31 +187,8 @@
     transform: translateY(-10px);
 }
 
-.searchInput {
-    background-color: var(--color-background);
-    border: 1px solid var(--color-border);
-    border-radius: 4px;
-    color: var(--color-text);
-    font-size: var(--size-default);
-    transition: border-color 0.2s ease;
-    margin: 0;
-    margin-bottom: var(--space-half);
-    min-width: 320px;
-    width: 100%;
-}
-
-.searchInput:focus {
-    outline: none;
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 2px rgba(var(--color-primary-rgb), 0.1);
-}
-
-.searchInput::placeholder {
-    color: var(--color-secondary);
-}
-
 @media (max-width: 768px) {
-    .searchInput {
+    .searchInput > div {
         padding-right: 0;
     }
 
diff --git a/frontends/web/src/routes/account/add/add-account.module.css b/frontends/web/src/routes/account/add/add-account.module.css
index 48c70dde17..3d1af07c67 100644
--- a/frontends/web/src/routes/account/add/add-account.module.css
+++ b/frontends/web/src/routes/account/add/add-account.module.css
@@ -20,10 +20,6 @@
     min-height: 90px;
 }
 
-.accountNameInput {
-    margin-bottom: 0;
-}
-
 .successMessage {
     color: var(--color-secondary);
 }
diff --git a/frontends/web/src/routes/account/add/add-account.tsx b/frontends/web/src/routes/account/add/add-account.tsx
index 4cd2059797..7f3b9a1815 100644
--- a/frontends/web/src/routes/account/add/add-account.tsx
+++ b/frontends/web/src/routes/account/add/add-account.tsx
@@ -78,7 +78,6 @@ const AddAccountSteps = ({
         }} />
         <Input
           autoFocus
-          className={styles.accountNameInput}
           ref={inputRef}
           id="accountName"
           onInput={onAccountNameInput}
diff --git a/frontends/web/src/routes/account/send/feetargets.module.css b/frontends/web/src/routes/account/send/feetargets.module.css
index 601546a608..45d43212c8 100644
--- a/frontends/web/src/routes/account/send/feetargets.module.css
+++ b/frontends/web/src/routes/account/send/feetargets.module.css
@@ -36,6 +36,14 @@
     margin-bottom: var(--space-quarter);
 }
 
+.fee input {
+    height: auto;
+}
+
+.fee input::placeholder {
+    font-size: var(--size-small);
+}
+
 .fee > div:not(:focus-within):not(:has(:invalid)) {
     border-left: none;
 }
@@ -60,11 +68,6 @@
     border-right-color: var(--background-secondary);
     border-width: var(--border-width);
 }
-
-.fee input::placeholder {
-    font-size: var(--size-small);
-}
-
 .customFeeUnit {
     color: var(--color-secondary);
     font-size: var(--size-small);
diff --git a/frontends/web/src/routes/device/bitbox02/setup/name.module.css b/frontends/web/src/routes/device/bitbox02/setup/name.module.css
index 4b98850bc3..42c237407a 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/name.module.css
+++ b/frontends/web/src/routes/device/bitbox02/setup/name.module.css
@@ -1,5 +1,5 @@
-.inputError input,
-.inputError input:focus {
+.inputError > div,
+.inputError > div:focus-within {
   border-color: var(--color-danger);
 }