diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css.map b/searx/static/themes/oscar/css/logicodev-dark.min.css.map
index c84b2cbde..32293f3a4 100644
Binary files a/searx/static/themes/oscar/css/logicodev-dark.min.css.map and b/searx/static/themes/oscar/css/logicodev-dark.min.css.map differ
diff --git a/searx/static/themes/oscar/css/logicodev.min.css.map b/searx/static/themes/oscar/css/logicodev.min.css.map
index e75276291..52840b8ad 100644
Binary files a/searx/static/themes/oscar/css/logicodev.min.css.map and b/searx/static/themes/oscar/css/logicodev.min.css.map differ
diff --git a/searx/static/themes/oscar/css/pointhi.min.css.map b/searx/static/themes/oscar/css/pointhi.min.css.map
index ecdb6b8f2..0767750d7 100644
Binary files a/searx/static/themes/oscar/css/pointhi.min.css.map and b/searx/static/themes/oscar/css/pointhi.min.css.map differ
diff --git a/searx/static/themes/simple/css/searxng-rtl.css b/searx/static/themes/simple/css/searxng-rtl.css
index 974e0c869..351d80df7 100644
--- a/searx/static/themes/simple/css/searxng-rtl.css
+++ b/searx/static/themes/simple/css/searxng-rtl.css
@@ -1992,6 +1992,7 @@ td:hover .engine-tooltip,
   background: inherit;
   border: inherit;
   padding: 0;
+  display: block;
 }
 .index .search_filters {
   display: block;
@@ -2119,13 +2120,28 @@ td:hover .engine-tooltip,
 * SearXNG, A privacy-respecting, hackable metasearch engine
 */
 #search {
-  padding: 0 2em 0 10rem;
+  padding: 1.5em 2em 0 6rem;
   margin: 0;
   background: var(--color-header-background);
   border-bottom: 1px solid var(--color-header-border);
+  display: grid;
+  column-gap: 1rem;
+  row-gap: 10px;
+  grid-template-columns: 3rem 1fr;
+  grid-template-areas: "logo search" "spacer categories";
+}
+#search_logo {
+  grid-area: logo;
+}
+.search_logo_img {
+  width: 40px;
+}
+.search_categories {
+  grid-area: categories;
 }
 #search_wrapper {
-  padding: 20px 0 10px 0;
+  padding: 0;
+  grid-area: search;
 }
 .search_box {
   margin: 0 12px 0 0;
@@ -2207,7 +2223,8 @@ td:hover .engine-tooltip,
 }
 @media screen and (max-width: 80em) {
   #search {
-    padding: 0 0.5rem;
+    padding: 1.5em 0.5rem 0 0.5rem;
+    column-gap: 0.5rem;
   }
   #categories {
     font-size: 90%;
@@ -2244,10 +2261,16 @@ td:hover .engine-tooltip,
     width: 100%;
     margin: 0;
     padding: 0.1em 0 0 0;
+    column-gap: 0;
+    row-gap: 0;
+    grid-template-areas: "logo search" "categories categories";
+  }
+  .search_logo {
+    padding: 0;
   }
   #search_wrapper {
     width: 100%;
-    margin: 0 0 0.7em 0;
+    margin: 0;
     padding: 0;
   }
   .search_box {
@@ -2274,7 +2297,7 @@ td:hover .engine-tooltip,
     width: 100%;
   }
   .category label {
-    border-bottom: 0;
+    padding: 10px !important;
   }
 }
 #categories {
diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css b/searx/static/themes/simple/css/searxng-rtl.min.css
index a4ae18616..db77f75ad 100644
Binary files a/searx/static/themes/simple/css/searxng-rtl.min.css and b/searx/static/themes/simple/css/searxng-rtl.min.css differ
diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css.map b/searx/static/themes/simple/css/searxng-rtl.min.css.map
index f2def3f3b..1fe710391 100644
Binary files a/searx/static/themes/simple/css/searxng-rtl.min.css.map and b/searx/static/themes/simple/css/searxng-rtl.min.css.map differ
diff --git a/searx/static/themes/simple/css/searxng.css b/searx/static/themes/simple/css/searxng.css
index 4d9523a8b..ce5846ae9 100644
--- a/searx/static/themes/simple/css/searxng.css
+++ b/searx/static/themes/simple/css/searxng.css
@@ -1992,6 +1992,7 @@ td:hover .engine-tooltip,
   background: inherit;
   border: inherit;
   padding: 0;
+  display: block;
 }
 .index .search_filters {
   display: block;
@@ -2119,13 +2120,28 @@ td:hover .engine-tooltip,
 * SearXNG, A privacy-respecting, hackable metasearch engine
 */
 #search {
-  padding: 0 2em 0 10rem;
+  padding: 1.5em 2em 0 6rem;
   margin: 0;
   background: var(--color-header-background);
   border-bottom: 1px solid var(--color-header-border);
+  display: grid;
+  column-gap: 1rem;
+  row-gap: 10px;
+  grid-template-columns: 3rem 1fr;
+  grid-template-areas: "logo search" "spacer categories";
+}
+#search_logo {
+  grid-area: logo;
+}
+.search_logo_img {
+  width: 40px;
+}
+.search_categories {
+  grid-area: categories;
 }
 #search_wrapper {
-  padding: 20px 0 10px 0;
+  padding: 0;
+  grid-area: search;
 }
 .search_box {
   margin: 0 12px 0 0;
@@ -2207,7 +2223,8 @@ td:hover .engine-tooltip,
 }
 @media screen and (max-width: 80em) {
   #search {
-    padding: 0 0.5rem;
+    padding: 1.5em 0.5rem 0 0.5rem;
+    column-gap: 0.5rem;
   }
   #categories {
     font-size: 90%;
@@ -2244,10 +2261,16 @@ td:hover .engine-tooltip,
     width: 100%;
     margin: 0;
     padding: 0.1em 0 0 0;
+    column-gap: 0;
+    row-gap: 0;
+    grid-template-areas: "logo search" "categories categories";
+  }
+  .search_logo {
+    padding: 0;
   }
   #search_wrapper {
     width: 100%;
-    margin: 0 0 0.7em 0;
+    margin: 0;
     padding: 0;
   }
   .search_box {
@@ -2274,7 +2297,7 @@ td:hover .engine-tooltip,
     width: 100%;
   }
   .category label {
-    border-bottom: 0;
+    padding: 10px !important;
   }
 }
 #categories {
diff --git a/searx/static/themes/simple/css/searxng.min.css b/searx/static/themes/simple/css/searxng.min.css
index 602e5c689..25510cab3 100644
Binary files a/searx/static/themes/simple/css/searxng.min.css and b/searx/static/themes/simple/css/searxng.min.css differ
diff --git a/searx/static/themes/simple/css/searxng.min.css.map b/searx/static/themes/simple/css/searxng.min.css.map
index 329a5041c..bfe996aae 100644
Binary files a/searx/static/themes/simple/css/searxng.min.css.map and b/searx/static/themes/simple/css/searxng.min.css.map differ