diff --git a/kafka-ui-react-app/src/components/common/Input/Input.tsx b/kafka-ui-react-app/src/components/common/Input/Input.tsx
index 0962165cb6000213002e6f36853d2fb1a95d7412..6196ff0959ad0a36afcc3916805612f7ed8f457f 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/Input.tsx
@@ -16,7 +16,7 @@ export interface InputProps
   withError?: boolean;
   label?: React.ReactNode;
   hint?: React.ReactNode;
-  children?: React.ReactNode;
+  icon?: React.ReactNode;
 
   // Some may only accept integer, like `Number of Partitions`
   // some may accept decimal
@@ -112,7 +112,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
     withError = false,
     label,
     hint,
-    children,
+    icon,
     ...rest
   } = props;
 
@@ -187,7 +187,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
           ref={ref}
           {...inputOptions}
         />
-        {search && children}
+        {search && icon}
 
         {withError && isHookFormField && (
           <S.FormError>
diff --git a/kafka-ui-react-app/src/components/common/Search/Search.tsx b/kafka-ui-react-app/src/components/common/Search/Search.tsx
index bf7c08e75f1645da509eb3ba507cd6022c2cef9c..411de019e56122c3fe52db614094fa963acd46a6 100644
--- a/kafka-ui-react-app/src/components/common/Search/Search.tsx
+++ b/kafka-ui-react-app/src/components/common/Search/Search.tsx
@@ -53,6 +53,7 @@ const Search: React.FC<SearchProps> = ({
       ref.current.value = '';
     }
   };
+
   return (
     <Input
       type="text"
@@ -63,11 +64,12 @@ const Search: React.FC<SearchProps> = ({
       disabled={disabled}
       ref={ref}
       search
-    >
-      <IconButtonWrapper onClick={clearSearchValue}>
-        <CloseIcon />
-      </IconButtonWrapper>
-    </Input>
+      icon={
+        <IconButtonWrapper onClick={clearSearchValue}>
+          <CloseIcon />
+        </IconButtonWrapper>
+      }
+    />
   );
 };