diff --git a/packages/web/src/javascripts/Components/Input/DecoratedInput.tsx b/packages/web/src/javascripts/Components/Input/DecoratedInput.tsx
index e537dc9ad..6ccee9ed6 100644
--- a/packages/web/src/javascripts/Components/Input/DecoratedInput.tsx
+++ b/packages/web/src/javascripts/Components/Input/DecoratedInput.tsx
@@ -1,3 +1,4 @@
+import { classNames } from '@standardnotes/utils'
 import { forwardRef, Fragment, Ref } from 'react'
 import { DecoratedInputProps } from './DecoratedInputProps'
 
@@ -41,12 +42,18 @@ const DecoratedInput = forwardRef(
   ) => {
     const hasLeftDecorations = Boolean(left?.length)
     const hasRightDecorations = Boolean(right?.length)
-    const classNames = getClassNames(hasLeftDecorations, hasRightDecorations, roundedFull)
+    const computedClassNames = getClassNames(hasLeftDecorations, hasRightDecorations, roundedFull)
 
     return (
-      <div className={`${classNames.container} ${disabled ? classNames.disabled : ''} ${className?.container}`}>
+      <div
+        className={classNames(
+          computedClassNames.container,
+          disabled ? computedClassNames.disabled : '',
+          className?.container,
+        )}
+      >
         {left && (
-          <div className="flex items-center px-2 py-1.5">
+          <div className={classNames('flex items-center px-2 py-1.5', className?.left)}>
             {left.map((leftChild, index) => (
               <Fragment key={index}>{leftChild}</Fragment>
             ))}
@@ -55,7 +62,7 @@ const DecoratedInput = forwardRef(
 
         <input
           autoComplete={autocomplete ? 'on' : 'off'}
-          className={`${classNames.input} ${disabled ? classNames.disabled : ''} ${className?.input}`}
+          className={`${computedClassNames.input} ${disabled ? computedClassNames.disabled : ''} ${className?.input}`}
           data-lpignore={type !== 'password' ? true : false}
           disabled={disabled}
           id={id}
@@ -73,7 +80,7 @@ const DecoratedInput = forwardRef(
         />
 
         {right && (
-          <div className="flex items-center px-2 py-1.5">
+          <div className={classNames('flex items-center px-2 py-1.5', className?.right)}>
             {right.map((rightChild, index) => (
               <div className={index > 0 ? 'ml-3' : ''} key={index}>
                 {rightChild}
diff --git a/packages/web/src/javascripts/Components/Input/DecoratedInputProps.ts b/packages/web/src/javascripts/Components/Input/DecoratedInputProps.ts
index 78a411390..61f132ce5 100644
--- a/packages/web/src/javascripts/Components/Input/DecoratedInputProps.ts
+++ b/packages/web/src/javascripts/Components/Input/DecoratedInputProps.ts
@@ -6,6 +6,8 @@ export type DecoratedInputProps = {
   className?: {
     container?: string
     input?: string
+    left?: string
+    right?: string
   }
   disabled?: boolean
   id?: string
diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchDialog.tsx b/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchDialog.tsx
index 9aa16b546..b63893a2e 100644
--- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchDialog.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchDialog.tsx
@@ -1,14 +1,9 @@
+import Button from '@/Components/Button/Button'
 import { useCommandService } from '@/Components/CommandProvider'
+import DecoratedInput from '@/Components/Input/DecoratedInput'
 import { TranslateFromTopAnimation, TranslateToTopAnimation } from '@/Constants/AnimationConfigs'
 import { useLifecycleAnimation } from '@/Hooks/useLifecycleAnimation'
-import {
-  ArrowDownIcon,
-  ArrowUpIcon,
-  CloseIcon,
-  ReplaceIcon,
-  ReplaceAllIcon,
-  ArrowRightIcon,
-} from '@standardnotes/icons'
+import { ArrowDownIcon, ArrowUpIcon, CloseIcon, ArrowRightIcon } from '@standardnotes/icons'
 import {
   keyboardStringForShortcut,
   SUPER_SEARCH_TOGGLE_CASE_SENSITIVE,
@@ -82,14 +77,17 @@ export const SearchDialog = ({ open, closeDialog }: { open: boolean; closeDialog
         }}
       >
         <div className="flex items-center gap-2">
-          <input
-            type="text"
+          <DecoratedInput
             placeholder="Search"
+            className={{
+              container: classNames('flex-grow !text-[length:inherit]', !query.length && '!py-1'),
+              right: '!py-1',
+            }}
             value={query}
-            onChange={(e) => {
+            onChange={(query) => {
               dispatch({
                 type: 'set-query',
-                query: e.target.value,
+                query,
               })
             }}
             onKeyDown={(event) => {
@@ -105,17 +103,18 @@ export const SearchDialog = ({ open, closeDialog }: { open: boolean; closeDialog
                 })
               }
             }}
-            className="rounded border border-border bg-default p-1 px-2"
             ref={focusOnMount}
+            right={[
+              <div className="min-w-[7ch] max-w-[7ch] flex-shrink-0 whitespace-nowrap text-right">
+                {query.length > 0 && (
+                  <>
+                    {currentResultIndex > -1 ? currentResultIndex + 1 + ' / ' : null}
+                    {results.length}
+                  </>
+                )}
+              </div>,
+            ]}
           />
-          {results.length > 0 ? (
-            <span className="min-w-[10ch] text-text">
-              {currentResultIndex > -1 ? currentResultIndex + 1 + ' of ' : null}
-              {results.length}
-            </span>
-          ) : (
-            <span className="min-w-[10ch] text-text">No results</span>
-          )}
           <label
             className={classNames(
               'relative flex items-center rounded border py-1 px-1.5 focus-within:ring-2 focus-within:ring-info focus-within:ring-offset-2 focus-within:ring-offset-default',
@@ -198,8 +197,8 @@ export const SearchDialog = ({ open, closeDialog }: { open: boolean; closeDialog
               className="rounded border border-border bg-default p-1 px-2"
               ref={focusOnMount}
             />
-            <button
-              className="flex items-center rounded border border-border p-1.5 hover:bg-contrast disabled:cursor-not-allowed"
+            <Button
+              small
               onClick={() => {
                 dispatchReplaceEvent({
                   type: 'next',
@@ -209,10 +208,10 @@ export const SearchDialog = ({ open, closeDialog }: { open: boolean; closeDialog
               disabled={results.length < 1 || replaceQuery.length < 1}
               title="Replace (Ctrl + Enter)"
             >
-              <ReplaceIcon className="h-4 w-4 fill-current text-text" />
-            </button>
-            <button
-              className="flex items-center rounded border border-border p-1.5 hover:bg-contrast disabled:cursor-not-allowed"
+              Replace
+            </Button>
+            <Button
+              small
               onClick={() => {
                 dispatchReplaceEvent({
                   type: 'all',
@@ -222,8 +221,8 @@ export const SearchDialog = ({ open, closeDialog }: { open: boolean; closeDialog
               disabled={results.length < 1 || replaceQuery.length < 1}
               title="Replace all (Ctrl + Alt + Enter)"
             >
-              <ReplaceAllIcon className="h-4 w-4 fill-current text-text" />
-            </button>
+              Replace all
+            </Button>
           </div>
         )}
       </div>