diff --git a/packages/dashboard-v2/src/components/Icons/icons/SearchIcon.js b/packages/dashboard-v2/src/components/Icons/icons/SearchIcon.js
new file mode 100644
index 00000000..f551dea6
--- /dev/null
+++ b/packages/dashboard-v2/src/components/Icons/icons/SearchIcon.js
@@ -0,0 +1,10 @@
+import { withIconProps } from "../withIconProps";
+
+export const SearchIcon = withIconProps(({ size, ...props }) => (
+  <svg width={size} height={size} viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" {...props}>
+    <path
+      fill="currentColor"
+      d="M9,0a9,9,0,0,1,7,14.62l3.68,3.67a1,1,0,0,1-1.32,1.5l-.1-.08L14.62,16A9,9,0,1,1,9,0ZM9,2a7,7,0,1,0,4.87,12l.07-.09.09-.07A7,7,0,0,0,9,2Z"
+    />
+  </svg>
+));
diff --git a/packages/dashboard-v2/src/components/Icons/index.js b/packages/dashboard-v2/src/components/Icons/index.js
index 41552e34..31b34b56 100644
--- a/packages/dashboard-v2/src/components/Icons/index.js
+++ b/packages/dashboard-v2/src/components/Icons/index.js
@@ -9,3 +9,4 @@ export * from "./icons/CircledErrorIcon";
 export * from "./icons/CircledProgressIcon";
 export * from "./icons/CircledArrowUpIcon";
 export * from "./icons/PlusIcon";
+export * from "./icons/SearchIcon";
diff --git a/packages/dashboard-v2/src/components/Icons/withIconProps.js b/packages/dashboard-v2/src/components/Icons/withIconProps.js
index d4267318..5da47331 100644
--- a/packages/dashboard-v2/src/components/Icons/withIconProps.js
+++ b/packages/dashboard-v2/src/components/Icons/withIconProps.js
@@ -4,7 +4,7 @@ const propTypes = {
   /**
    * Size of the icon's bounding box.
    */
-  size: PropTypes.number,
+  size: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 };
 
 const defaultProps = {
diff --git a/packages/dashboard-v2/src/components/TextInputIcon/TextInputIcon.js b/packages/dashboard-v2/src/components/TextInputIcon/TextInputIcon.js
index 892da996..506ee1fc 100644
--- a/packages/dashboard-v2/src/components/TextInputIcon/TextInputIcon.js
+++ b/packages/dashboard-v2/src/components/TextInputIcon/TextInputIcon.js
@@ -1,20 +1,45 @@
 import PropTypes from "prop-types";
+import cn from "classnames";
+import { useEffect, useRef, useState } from "react";
+import { PlusIcon } from "../Icons";
+
+export const TextInputIcon = ({ className, icon, placeholder, onChange }) => {
+  const inputRef = useRef();
+  const [focused, setFocused] = useState(false);
+  const [value, setValue] = useState("");
+
+  useEffect(() => {
+    onChange(value);
+  }, [value, onChange]);
 
-/**
- * Primary UI component for user interaction
- */
-export const TextInputIcon = ({ icon, position, placeholder }) => {
   return (
-    <div className={"flex flex-row items-center px-textInputIcon h-textInput rounded-full bg-palette-100"}>
-      {position === "left" ? <div className={"w-buttonIconLg h-buttonIconLg"}>{icon}</div> : null}
-      <input
-        placeholder={placeholder}
-        className={
-          "w-full focus:outline-none mx-textInputHorizontal rounded-full bg-transparent " +
-          "placeholder-palette-400 text-content tracking-inputPlaceholder text-textInput"
+    <div
+      className={cn(
+        "grid-flow-col inline-grid grid-cols-[2rem_1fr_1.5rem] items-center rounded-full bg-palette-100 px-4 py-2",
+        className,
+        {
+          "outline outline-1 outline-primary": focused,
         }
+      )}
+    >
+      <div>{icon}</div>
+      <input
+        ref={inputRef}
+        value={value}
+        onFocus={() => setFocused(true)}
+        onBlur={() => setFocused(false)}
+        onChange={(event) => setValue(event.target.value)}
+        placeholder={placeholder}
+        className="focus:outline-none bg-transparent placeholder:text-palette-400"
       />
-      {position === "right" ? <div className={"w-buttonIconLg h-buttonIconLg"}>{icon}</div> : null}
+      {value && (
+        <PlusIcon
+          size={14}
+          role="button"
+          className="justify-self-end text-palette-400 rotate-45"
+          onClick={() => setValue("")}
+        />
+      )}
     </div>
   );
 };
@@ -23,13 +48,13 @@ TextInputIcon.propTypes = {
   /**
    * Icon to place in text input
    */
-  icon: PropTypes.element,
-  /**
-   * Side to place icon
-   */
-  position: PropTypes.oneOf(["left", "right"]),
+  icon: PropTypes.element.isRequired,
   /**
    * Input placeholder
    */
   placeholder: PropTypes.string,
+  /**
+   * Function to be called whenever value changes
+   */
+  onChange: PropTypes.func.isRequired,
 };
diff --git a/packages/dashboard-v2/src/components/TextInputIcon/TextInputIcon.stories.js b/packages/dashboard-v2/src/components/TextInputIcon/TextInputIcon.stories.js
index 676ca9cf..521b90df 100644
--- a/packages/dashboard-v2/src/components/TextInputIcon/TextInputIcon.stories.js
+++ b/packages/dashboard-v2/src/components/TextInputIcon/TextInputIcon.stories.js
@@ -1,5 +1,6 @@
 import { TextInputIcon } from "./TextInputIcon";
-import { CogIcon } from "../Icons";
+import { SearchIcon } from "../Icons";
+import { Panel } from "../Panel";
 
 // More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 export default {
@@ -9,19 +10,21 @@ export default {
 };
 
 // More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const Template = (args) => <TextInputIcon {...args} />;
+const Template = (args) => (
+  <Panel>
+    <TextInputIcon {...args} />
+  </Panel>
+);
 
 export const IconLeft = Template.bind({});
 // More on args: https://storybook.js.org/docs/react/writing-stories/args
 IconLeft.args = {
-  icon: <CogIcon />,
-  position: "left",
+  icon: <SearchIcon size={20} />,
   placeholder: "Search",
 };
 
 export const IconRight = Template.bind({});
 IconRight.args = {
-  icon: <CogIcon />,
-  position: "right",
+  icon: <SearchIcon size={20} />,
   placeholder: "Search",
 };
diff --git a/packages/dashboard-v2/tailwind.config.js b/packages/dashboard-v2/tailwind.config.js
index 4afa0cb2..6f4242d9 100644
--- a/packages/dashboard-v2/tailwind.config.js
+++ b/packages/dashboard-v2/tailwind.config.js
@@ -28,6 +28,7 @@ module.exports = {
     borderColor: (theme) => ({ ...theme("colors"), ...colors }),
     textColor: (theme) => ({ ...theme("colors"), ...colors }),
     placeholderColor: (theme) => ({ ...theme("colors"), ...colors }),
+    outlineColor: (theme) => ({ ...theme("colors"), ...colors }),
     extend: {
       fontFamily: {
         sans: ["Sora", ...defaultTheme.fontFamily.sans],