diff --git a/libs/remix-ui/search/src/lib/components/Exclude.tsx b/libs/remix-ui/search/src/lib/components/Exclude.tsx
index 9047e26ce7..5385783324 100644
--- a/libs/remix-ui/search/src/lib/components/Exclude.tsx
+++ b/libs/remix-ui/search/src/lib/components/Exclude.tsx
@@ -18,7 +18,7 @@ export const Exclude = props => {
   return (
     <>
       <div className="search_plugin_find-part pl-3">
-        <label className='mt-2'>files to exclude</label>
+        <label className='mt-2'>Files to exclude</label>
         <input
           id='search_exclude'
           placeholder="Exclude ie .git/**/*"
diff --git a/libs/remix-ui/search/src/lib/components/FindContainer.tsx b/libs/remix-ui/search/src/lib/components/FindContainer.tsx
index 3d3e72e5a9..7bd5d5ba1c 100644
--- a/libs/remix-ui/search/src/lib/components/FindContainer.tsx
+++ b/libs/remix-ui/search/src/lib/components/FindContainer.tsx
@@ -1,6 +1,7 @@
 import React, { useContext, useEffect, useState } from 'react'
 import { SearchContext } from '../context/context'
 import { Find } from './Find'
+import { OverWriteCheck } from './OverWriteCheck'
 import { Replace } from './Replace'
 
 export const FindContainer = props => {
@@ -26,7 +27,8 @@ export const FindContainer = props => {
       ></div>
       <div className="search_plugin_find_container_internal">
         <Find></Find>
-        {expanded ? <Replace></Replace> : null}
+        {expanded ? 
+        <><Replace></Replace><OverWriteCheck></OverWriteCheck></> : null}
       </div>
     </div>
   )
diff --git a/libs/remix-ui/search/src/lib/components/Search.tsx b/libs/remix-ui/search/src/lib/components/Search.tsx
index a8f32ce4d5..7f6d62aa5e 100644
--- a/libs/remix-ui/search/src/lib/components/Search.tsx
+++ b/libs/remix-ui/search/src/lib/components/Search.tsx
@@ -16,12 +16,11 @@ const plugin = props.plugin
 
 return (
     <>
-    <div className="search_plugin_search_tab pl-2 pr-2">
+    <div className="search_plugin_search_tab px-2">
       <SearchProvider plugin={plugin}>
         <FindContainer></FindContainer>
         <Include></Include>
         <Exclude></Exclude>
-        <OverWriteCheck></OverWriteCheck>
         <Undo></Undo>
         <Results></Results>
       </SearchProvider>
diff --git a/libs/remix-ui/search/src/lib/components/results/ResultItem.tsx b/libs/remix-ui/search/src/lib/components/results/ResultItem.tsx
index c0d1ee1ff6..b0ac872251 100644
--- a/libs/remix-ui/search/src/lib/components/results/ResultItem.tsx
+++ b/libs/remix-ui/search/src/lib/components/results/ResultItem.tsx
@@ -103,8 +103,8 @@ export const ResultItem = (props: ResultItemProps) => {
           </div>
           {loading ? <div className="loading">Loading...</div> : null}
           {!toggleExpander && !loading ? (
-            <div className="p-1 search_plugin_wrap_summary">
-              {state.replaceEnabled? <div onClick={async() => replace()} className='btn btn-primary btn-block mb-2 btn-sm'>Replace all</div>:null}
+            <div className="search_plugin_wrap_summary">
+              {state.replaceEnabled? <div onClick={async() => replace()} className='btn btn-secondary btn-block mb-2 btn-sm'>Replace all</div>:null}
               {lines.map((line, index) => (   
                 index < state.maxLines ? 
                 <ResultSummary
diff --git a/libs/remix-ui/search/src/lib/search.css b/libs/remix-ui/search/src/lib/search.css
index ccf55adff2..1b88368bc8 100644
--- a/libs/remix-ui/search/src/lib/search.css
+++ b/libs/remix-ui/search/src/lib/search.css
@@ -21,7 +21,7 @@
 .search_plugin_find-part {
     display: flex;
     flex-direction: column;
-    padding: 2px;
+    padding-top: 5px;
 }
 
 .search_plugin_controls {