diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html
index c055574f..28a5884e 100644
--- a/explore/src/app/home/home.component.html
+++ b/explore/src/app/home/home.component.html
@@ -7,68 +7,14 @@
 </ng-template>
 <div class="image-front-topbar mainPageSearchForm">
   <div class="uk-section">
-    <div class="uk-container">
-      <div class="search_box_bg uk-flex uk-flex-center">
-        <div>
-          <form class="uk-margin">
-            <div class="uk-grid uk-margin-small-left">
-              <div class="uk-margin-small-top uk-padding-remove-left">
-                <entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
-                                    [properties]="properties" [onChangeNavigate]="false"
-                                    (selectionChange)="entityChanged($event)"
-                ></entities-selection>
-              </div>
-              <div class=" uk-padding-remove-left uk-margin-small-top">
-                <div class="uk-inline">
-                  <a *ngIf="keyword.length > 0" class="uk-form-icon uk-form-icon-flip" (click)="keyword = ''"
-                     uk-icon="icon: close"></a>
-                  <input type="text" class="uk-input   uk-width-xlarge@l uk-width-large@m uk-width-medium"
-                         placeholder="Search in OpenAIRE for scholarly works"
-                         [(ngModel)]="keyword"
-                         name="keyword">
-                </div>
-                <div class=" quickSelectionsBox uk-width-xlarge@l uk-width-large@m uk-width-medium">
-                  <quick-selections *ngIf="selectedEntity == 'result'" [resultTypes]="resultTypes"
-                                    [quickFilter]="resultsQuickFilter"
-                                    [properties]="properties">
-                  </quick-selections>
-                </div>
-              </div>
-              <div class="uk-padding-remove-left uk-margin-small-top">
-
-                <button (click)="goTo(true)" type="submit"
-                        class="uk-button portal-button uk-text-bold  uk-padding uk-padding-remove-vertical uk-margin-small-left">
-                  Search
-                </button>
-                <div class="uk-margin-small-top  uk-margin-left">
-                  <!--                        (click)="goTo(false)"-->
-                  <a *ngIf="selectedEntity!='all'" (click)="goTo(false)" class="portal-link">Advanced Search</a>
-                  <a *ngIf="selectedEntity=='all'" class="portal-link ">Advanced Search</a></div>
-                <div *ngIf="selectedEntity=='all'" uk-dropdown class="uk-dropdown default-dropdown">
-                  <ul class="uk-list uk-margin-remove-bottom">
-                    <li *ngIf="showSoftware || showPublications || showOrp || showDatasets"><a
-                        [routerLink]="properties.searchLinkToAdvancedResults"
-                        [queryParams]="{qf:true, q: keyword, op: 'and'}"
-                    >Research
-                      outcomes</a></li>
-                    <li *ngIf="showProjects"><a
-                        [routerLink]="properties.searchLinkToAdvancedProjects"
-                        [queryParams]="{q: keyword, op: 'and'}">
-                      Projects</a></li>
-                    <li *ngIf="showDataProviders"><a
-                        [routerLink]="properties.searchLinkToAdvancedDataProviders"
-                        [queryParams]="{q: keyword, op: 'and'}">
-                      Content providers</a></li>
-                    <li *ngIf="showOrganizations"><a
-                        [routerLink]="properties.searchLinkToAdvancedOrganizations"
-                        [queryParams]="{q: keyword, op: 'and'}">
-                      Organizations</a></li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-          </form>
-        </div>
+    <div class="uk-container uk-container-large uk-flex uk-flex-center">
+      <div class="uk-width-xlarge@l uk-width-large uk-child-width-1-1">
+          <advanced-search-input [class.uk-hidden]="entities.disableSelect" (searchEmitter)="goTo(true)">
+            <entities-selection #entities [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
+                                (selectionChange)="entityChanged($event)"
+                                [onChangeNavigate]="false"></entities-selection>
+            <div input placeholder="Scholary works" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
+          </advanced-search-input>
       </div>
     </div>
     <div class="uk-margin-medium">
diff --git a/explore/src/app/home/home.module.ts b/explore/src/app/home/home.module.ts
index 4e8f3c0f..cdbef5b9 100644
--- a/explore/src/app/home/home.module.ts
+++ b/explore/src/app/home/home.module.ts
@@ -25,6 +25,8 @@ import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
 import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
 import {arrow_right, book, cog, database, earth} from "../openaireLibrary/utils/icons/icons";
 import {NumbersModule} from "../openaireLibrary/sharedComponents/numbers/numbers.module";
+import {AdvancedSearchInputModule} from "../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module";
+import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module";
 
  @NgModule({
    imports: [
@@ -35,7 +37,7 @@ import {NumbersModule} from "../openaireLibrary/sharedComponents/numbers/numbers
      PiwikServiceModule,
      HomeRoutingModule,
      HelperModule,
-     SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule
+     SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule
    ],
   declarations: [
     HomeComponent
diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary
index d17f9b4d..cee1d9f8 160000
--- a/explore/src/app/openaireLibrary
+++ b/explore/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit d17f9b4d5c548a8f5f36cc7049f1b27ac23874d3
+Subproject commit cee1d9f8767063877438665f13d34148a6fe531b
diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme
index 0690007b..a47c66f4 160000
--- a/explore/src/assets/openaire-theme
+++ b/explore/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 0690007b7b3eb567b09b09c6f2968d5abc700cc9
+Subproject commit a47c66f4802cb7af2ad12f1ad75516e94b20c328