diff --git a/css/import.css b/css/import.css
index 40e684c..c1ab8ed 100644
--- a/css/import.css
+++ b/css/import.css
@@ -3,7 +3,6 @@
 @import "theme.update.css";
 
 @import "structure/variables.css";
-@import "structure/advanced-search-input.css";
 @import "structure/alert.css";
 @import "structure/background.css";
 @import "structure/breadcrumb.css";
@@ -18,12 +17,12 @@
 @import "structure/navbar.css";
 @import "structure/offcanvas.css";
 @import "structure/pill.css";
+@import "structure/search-input.css";
 @import "structure/shadow.css";
 @import "structure/slider.css";
+@import "structure/stepper.css";
 @import "structure/tab.css";
 @import "structure/text.css";
 @import "structure/width.css";
 
 @import "openaire.css";
-
-@import "structure/stepper.css";
diff --git a/css/structure/advanced-search-input.css b/css/structure/advanced-search-input.css
deleted file mode 100644
index 336c0c7..0000000
--- a/css/structure/advanced-search-input.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.advanced-search-input {
-  --advanced-input-shadow: var(--shadow-inset);
-  --advanced-input-border-radius: 54px;
-  --advanced-input-search-color: var(--secondary-color);
-  --advanced-input-search-color-disabled: var(--disable-color);
-  --advanced-input-divider: 1px solid var(--muted-color);
-  border-radius: var(--advanced-input-border-radius);
-  box-shadow: var(--advanced-input-shadow);
-}
-
-.advanced-search-input .inputs > :not(:last-child) {
-  position: relative;
-}
-
-.advanced-search-input .inputs > :not(:last-child):after {
-  content: '';
-  position: absolute;
-  right: 0;
-  top: 15px;
-  bottom: 15px;
-  width: 0;
-  border-left: var(--advanced-input-divider);
-}
-
-.advanced-search-input .search {
-  color: var(--advanced-input-search-color);
-  cursor: pointer;
-  user-select: none;
-}
-
-.advanced-search-input .search.disabled {
-  color: var(--advanced-input-search-color-disabled);
-  cursor: default;
-  pointer-events: none;
-}
diff --git a/css/structure/search-input.css b/css/structure/search-input.css
new file mode 100644
index 0000000..1fbd355
--- /dev/null
+++ b/css/structure/search-input.css
@@ -0,0 +1,40 @@
+.search-input {
+  --search-input-shadow: none;
+  --search-input-border-radius: 54px;
+  --search-input-icon-color: var(--secondary-color);
+  --search-input-icon-color-disabled: var(--disable-color);
+  --search-input-divider: 1px solid var(--muted-color);
+  border-radius: var(--search-input-border-radius);
+  box-shadow: var(--search-input-shadow);
+}
+
+.search-input .inputs > :not(:last-child) {
+  position: relative;
+}
+
+.search-input .inputs > :not(:last-child):after {
+  content: '';
+  position: absolute;
+  right: 0;
+  top: 15px;
+  bottom: 15px;
+  width: 0;
+  border-left: var(--search-input-divider);
+}
+
+.search-input .search {
+  color: var(--search-input-icon-color);
+  cursor: pointer;
+  user-select: none;
+}
+
+.search-input .search.disabled {
+  color: var(--search-input-icon-color-disabled);
+  cursor: default;
+  pointer-events: none;
+}
+
+/* Modifiers */
+.inner {
+  --search-input-shadow: var(--shadow-inset);
+}