diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html
index 0f041baf..4d75685e 100644
--- a/landingPages/dataProvider/dataProvider.component.html
+++ b/landingPages/dataProvider/dataProvider.component.html
@@ -82,15 +82,8 @@
   
             <div *ngIf="!showLoading" class="uk-visible@s uk-margin-top uk-margin-bottom">
               <div class="uk-flex uk-flex-middle uk-flex-center">
-                <div class="landing-action-bar uk-box-shadow-small uk-margin-bottom">
-                  <div class="landing-action-bar-grid-gap uk-flex uk-flex-middle uk-text-xsmall">
-                    <!-- Actions -->
-                    <a (click)="openAddThisModal()"
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon [flex]="true" [ratio]="0.8" name="share" visuallyHidden="share"></icon>
-                      <span class="uk-margin-xsmall-left">Share</span>
-                    </a>
-                  </div>
+                <div class="landing-action-bar uk-text-xsmall uk-box-shadow-small uk-margin-bottom">
+                  <entity-actions [share]="true" [type]="'dataprovider'"></entity-actions>
                 </div>
               </div>
             </div>
@@ -884,4 +877,4 @@
 
 <fs-modal *ngIf="dataProviderInfo" #addThisFsModal classTitle="uk-tile-default uk-border-bottom" classBody="uk-flex uk-flex-center uk-flex-middle">
   <addThis></addThis>
-</fs-modal>
\ No newline at end of file
+</fs-modal>
diff --git a/landingPages/dataProvider/dataProvider.module.ts b/landingPages/dataProvider/dataProvider.module.ts
index 1ec1f0e2..5aa044ba 100644
--- a/landingPages/dataProvider/dataProvider.module.ts
+++ b/landingPages/dataProvider/dataProvider.module.ts
@@ -36,6 +36,7 @@ import {LoadingModalModule} from "../../utils/modal/loadingModal.module";
 import {ResultLandingUtilsModule} from "../landing-utils/resultLandingUtils.module";
 import {FullScreenModalModule} from '../../utils/modal/full-screen-modal/full-screen-modal.module';
 import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
+import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
 
 @NgModule({
   imports:
@@ -45,7 +46,7 @@ import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
       PagingModule, Schema2jsonldModule, SEOServiceModule, ShowPublisherModule, HelperModule,
       LandingHeaderModule, AlertModalModule, NoLoadPaging, FeedbackModule,
       TabsModule, SearchTabModule, LoadingModule, IconsModule, LoadingModalModule, ResultLandingUtilsModule,
-			FullScreenModalModule, SafeHtmlPipeModule
+      FullScreenModalModule, SafeHtmlPipeModule, EntityActionsModule
     ],
   declarations:
   [StatisticsTabComponent,
diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html
index 9220b421..c6e0e9c2 100644
--- a/landingPages/organization/organization.component.html
+++ b/landingPages/organization/organization.component.html
@@ -83,28 +83,28 @@
 						<div *ngIf="!showLoading" class="uk-margin-top uk-margin-bottom">
 							<div class="uk-flex uk-flex-middle uk-flex-center">
 								<div class="landing-action-bar uk-box-shadow-small uk-margin-bottom">
-									<div class="landing-action-bar-grid-gap uk-flex uk-flex-middle uk-text-xsmall">
-										<!-- Versions -->
-										<a *ngIf="organizationInfo?.deletedByInferenceIds" (click)="openDeletedByInference()" 
-											class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-											<icon flex="true" ratio="0.8" name="versions" visuallyHidden="versions"></icon>
-											<span class="uk-margin-xsmall-left">
+									<div class="uk-grid uk-grid-small uk-flex-between uk-text-xsmall uk-flex-middle uk-grid-divider" uk-grid>
+										<div class="uk-width-auto">
+											<!-- Versions -->
+											<a *ngIf="organizationInfo?.deletedByInferenceIds" (click)="openDeletedByInference()"
+												 class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
+												<icon flex="true" ratio="0.8" name="versions" visuallyHidden="versions"></icon>
+												<span class="uk-margin-xsmall-left">
 												View all {{organizationInfo.deletedByInferenceIds.length}} versions
 											</span>
-										</a>
-										<!-- Divider -->
-										<span *ngIf="organizationInfo?.deletedByInferenceIds" class="landing-action-bar-divider"></span>
-										<!-- Actions -->
-										<a (click)="openAddThisModal()"
-											class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-											<icon flex="true" ratio="0.8" name="share" visuallyHidden="share"></icon>
-											<span class="uk-margin-xsmall-left">Share</span>
-										</a>
-										<a (click)="buildFunderOptions(); openDownloadReportsModal()"
-											class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-											<icon flex="true" ratio="0.8" name="download" visuallyHidden="download"></icon>
-											<span class="uk-margin-xsmall-left">Download</span>
-										</a>
+											</a>
+										</div>
+										<div class="uk-width-expand">
+											<entity-actions [share]="true" [type]="'organization'">
+												<div>
+													<a (click)="buildFunderOptions(); openDownloadReportsModal()"
+														 class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
+														<icon flex="true" ratio="0.8" name="download" visuallyHidden="download"></icon>
+														<span class="uk-margin-xsmall-left">Download</span>
+													</a>
+												</div>
+											</entity-actions>
+										</div>
 									</div>
 								</div>
 							</div>
diff --git a/landingPages/organization/organization.module.ts b/landingPages/organization/organization.module.ts
index 9d5448fa..a367d897 100644
--- a/landingPages/organization/organization.module.ts
+++ b/landingPages/organization/organization.module.ts
@@ -32,6 +32,8 @@ import {InputModule} from '../../sharedComponents/input/input.module';
 import {IconsService} from '../../utils/icons/icons.service';
 import {graph, versions} from "../../utils/icons/icons";
 import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-screen-modal.module";
+import {EGIDataTransferModule} from "../../utils/dataTransfer/transferData.module";
+import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
 
 
 @NgModule({
@@ -49,7 +51,7 @@ import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-sc
     Schema2jsonldModule, SEOServiceModule, HelperModule,
     OrganizationsDeletedByInferenceModule, LandingHeaderModule, FeedbackModule,
     MatSelectModule,
-    TabsModule, SearchTabModule, LoadingModule, IconsModule, InputModule, FullScreenModalModule
+    TabsModule, SearchTabModule, LoadingModule, IconsModule, InputModule, FullScreenModalModule, EGIDataTransferModule, EntityActionsModule
   ],
   declarations: [
     OrganizationComponent,
diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html
index 8263325a..f1661901 100644
--- a/landingPages/project/project.component.html
+++ b/landingPages/project/project.component.html
@@ -116,48 +116,20 @@
                 <loading></loading>
               </div>
             </div>
-
             <!-- new action bar -->
             <div *ngIf="!showLoading" class="uk-visible@s uk-margin-top uk-margin-bottom">
               <div class="uk-flex uk-flex-middle uk-flex-center">
-                <div class="landing-action-bar uk-box-shadow-small uk-margin-bottom">
-                  <div class="landing-action-bar-grid-gap uk-flex uk-flex-middle uk-text-xsmall">
-                    <!-- Actions -->
-                    <a *ngIf="isRouteAvailable('participate/direct-claim')"
-                      [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[projectId, 'project','result'])"
-                      routerLinkActive="router-link-active" routerLink="/participate/direct-claim"
-                      [title]="'Link '+openaireEntities.RESULTS+' with a '+openaireEntities.PROJECT+', a '+openaireEntities.COMMUNITY+' or other '+openaireEntities.RESULTS+' and make the new information available in OpenAIRE information space.'"
-                      [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon flex="true" ratio="0.7" name="link_to" visuallyHidden="link"></icon>
-                      <span class="uk-margin-xsmall-left">Link to</span>
-                    </a>
-                    <a (click)="openAddThisModal()"
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon flex="true" ratio="0.8" name="share" visuallyHidden="share"></icon>
-                      <span class="uk-margin-xsmall-left">Share</span>
-                    </a>
-                    <a *ngIf="isRouteAvailable('participate/deposit/learn-how')"
-                      routerLinkActive="router-link-active" routerLink="/participate/deposit/learn-how"
-                      [title]="'Find a repository to deposit or publish your research in Open Access'"
-                      [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon flex="true" ratio="0.7" name="upload" visuallyHidden="upload"></icon>
-                      <span class="uk-margin-xsmall-left">Deposit</span>
-                    </a>
-                    <a (click)="openEmbedResultsModal()"
-                      [title]="'Embed the related '+openaireEntities.RESULTS+' of this '+openaireEntities.PROJECT+' in your website'"
-                      [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon flex="true" ratio="0.8" name="code" visuallyHidden="code"></icon>
-                      <span class="uk-margin-xsmall-left">Embed</span>
-                    </a>
-                    <a (click)="openDownloadReportModal()"
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon flex="true" ratio="0.8" name="download" visuallyHidden="download"></icon>
-                      <span class="uk-margin-xsmall-left">Download</span>
-                    </a>
-                  </div>
+                <div class="landing-action-bar uk-text-xsmall uk-box-shadow-small uk-margin-bottom">
+                  <entity-actions [deposit]="true" [share]="true" [linking]="true" [embed]="true"
+                                  [type]="'project'" [result]="projectInfo" [id]="projectInfo.id">
+                    <div>
+                      <a (click)="openDownloadReportModal()"
+                         class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
+                        <icon flex="true" ratio="0.8" name="download" visuallyHidden="download"></icon>
+                        <span class="uk-margin-xsmall-left">Download</span>
+                      </a>
+                    </div>
+                  </entity-actions>
                 </div>
               </div>
             </div>
diff --git a/landingPages/project/project.module.ts b/landingPages/project/project.module.ts
index 617e3d85..a85a3a9c 100644
--- a/landingPages/project/project.module.ts
+++ b/landingPages/project/project.module.ts
@@ -3,7 +3,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';
-import { MatSelectModule } from "@angular/material/select";
+import {MatSelectModule} from "@angular/material/select";
 
 import {ProjectComponent} from './project.component';
 import {ProjectServiceModule} from './projectService.module';
@@ -34,6 +34,8 @@ import {IconsService} from "../../utils/icons/icons.service";
 import {graph, link, link_to, open_access} from "../../utils/icons/icons";
 import {FullScreenModalModule} from '../../utils/modal/full-screen-modal/full-screen-modal.module';
 import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
+import {EGIDataTransferModule} from "../../utils/dataTransfer/transferData.module";
+import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
 
 @NgModule({
   imports: [
@@ -44,7 +46,7 @@ import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
     Schema2jsonldModule, SEOServiceModule, HelperModule,
     LandingHeaderModule, MatSelectModule, FeedbackModule, AltMetricsModule,
     TabsModule, SearchTabModule, LoadingModule, IconsModule, InputModule,
-		FullScreenModalModule, SafeHtmlPipeModule
+    FullScreenModalModule, SafeHtmlPipeModule, EGIDataTransferModule, EntityActionsModule
   ],
   declarations: [
     ProjectComponent
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index a7f40041..b65506c3 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -116,49 +116,38 @@
             <div *ngIf="!showLoading" class="uk-margin-top uk-margin-bottom">
               <div class="uk-flex uk-flex-middle uk-flex-center">
                 <div class="landing-action-bar uk-box-shadow-small uk-margin-bottom">
-                  <div class="landing-action-bar-grid-gap uk-flex uk-flex-middle uk-text-xsmall">
-                    <!-- Download from -->
-                    <availableOn *ngIf="resultLandingInfo?.hostedBy_collectedFrom" [availableOn]="resultLandingInfo.hostedBy_collectedFrom" (viewAllClicked)="viewAll=$event"></availableOn>
-                    <!-- Versions -->
-                    <a *ngIf="resultLandingInfo?.deletedByInferenceIds" (click)="openDeletedByInference()" 
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon [flex]="true" [ratio]="0.8" name="versions" visuallyHidden="versions"></icon>
-                      <span class="uk-margin-xsmall-left">
-                        View all {{resultLandingInfo.deletedByInferenceIds.length}} versions
-                      </span>
-                    </a>
-                    <!-- Divider -->
-                    <span *ngIf="resultLandingInfo?.hostedBy_collectedFrom || resultLandingInfo?.deletedByInferenceIds" class="landing-action-bar-divider"></span>
-                    <!-- Actions -->
-                    <a *ngIf="isRouteAvailable('participate/direct-claim')"
-                      [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[id,type,'project'])"
-                      routerLinkActive="router-link-active" routerLink="/participate/direct-claim"
-                      [title]="'Link '+openaireEntities.RESULTS+' with a '+openaireEntities.PROJECT+', a '+openaireEntities.COMMUNITY+' or other '+openaireEntities.RESULTS+' and make the new information available in OpenAIRE information space.'"
-                      [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon [flex]="true" [ratio]="0.7" name="link_to" visuallyHidden="link"></icon>
-                      <span class="uk-margin-xsmall-left">Link to</span>
-                    </a>
-                    <a (click)="openAddThisModal()"
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon [flex]="true" [ratio]="0.8" name="share" visuallyHidden="share"></icon>
-                      <span class="uk-margin-xsmall-left">Share</span>
-                    </a>
-                    <a (click)="openCiteModal()"
-                      class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-                      <icon [flex]="true" [ratio]="0.7" name="cite" visuallyHidden="cite"></icon>
-                      <span class="uk-margin-xsmall-left">Cite</span>
-                    </a>
-                    <ng-container *ngIf="properties.adminToolsPortalType == 'explore' || properties.adminToolsPortalType == 'community' || properties.adminToolsPortalType == 'aggregator'" >
-                      <orcid-work [resultId]="id" [resultTitle]="resultLandingInfo?.title" [resultLandingInfo]="resultLandingInfo"
-                        [pids]="pidsArrayString" [pageType]="'landing'">
-                      </orcid-work>
-                    </ng-container>
-                    <ng-container *ngIf=" properties.enableEoscDataTransfer && resultLandingInfo.resultType == 'dataset' &&
-                      resultLandingInfo.identifiers && resultLandingInfo.identifiers.get('doi') && 
-                      resultLandingInfo.identifiers.get('doi').join('').indexOf('zenodo.')!=-1">
-                      <egi-transfer-data [dois]="resultLandingInfo.identifiers.get('doi')" [isOpen]="egiTransferModalOpen"></egi-transfer-data>
-                    </ng-container>
+                  <div class="uk-grid uk-grid-small uk-flex-between uk-text-xsmall uk-flex-middle uk-grid-divider" uk-grid>
+                    <div class="uk-width-auto">
+                      <div class="uk-grid uk-grid-small uk-child-width-auto" uk-grid>
+                        <availableOn *ngIf="resultLandingInfo?.hostedBy_collectedFrom?.length" [availableOn]="resultLandingInfo.hostedBy_collectedFrom"></availableOn>
+                        <!-- Versions -->
+                        <a *ngIf="resultLandingInfo?.deletedByInferenceIds" (click)="openDeletedByInference()"
+                           class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
+                          <icon [flex]="true" [ratio]="0.8" name="versions" visuallyHidden="versions"></icon>
+                          <span class="uk-margin-xsmall-left">
+                            View all {{resultLandingInfo.deletedByInferenceIds.length}} versions
+                          </span>
+                        </a>
+                      </div>
+                    </div>
+                    <div class="uk-width-expand">
+                      <entity-actions [cite]="true" [share]="true" [linking]="true"
+                                      [type]="resultLandingInfo.resultType"
+                                      [result]="resultLandingInfo" [id]="resultLandingInfo.objIdentifier">
+                        <!-- ORCID -->
+                        <div *ngIf="properties.adminToolsPortalType == 'explore' || properties.adminToolsPortalType == 'community'  || properties.adminToolsPortalType == 'aggregator'"
+                             class="uk-margin-small-right">
+                          <orcid-work [resultId]="id" [resultTitle]="resultLandingInfo.title" [resultLandingInfo]="resultLandingInfo"
+                                      [pids]="pidsArrayString" [pageType]="'landing'">
+                          </orcid-work>
+                        </div>
+                        <div *ngIf=" properties.enableEoscDataTransfer && resultLandingInfo.resultType == 'dataset' &&
+                            resultLandingInfo.identifiers && resultLandingInfo.identifiers.get('doi') &&
+                            resultLandingInfo.identifiers.get('doi').join('').indexOf('zenodo.')!=-1">
+                          <egi-transfer-data [dois]="resultLandingInfo.identifiers.get('doi')" [isOpen]="egiTransferModalOpen"></egi-transfer-data>
+                        </div>
+                      </entity-actions>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1305,4 +1294,4 @@
 
 <fs-modal *ngIf="resultLandingInfo" #addThisFsModal classTitle="uk-tile-default uk-border-bottom" classBody="uk-flex uk-flex-center uk-flex-middle">
   <addThis></addThis>
-</fs-modal>
\ No newline at end of file
+</fs-modal>
diff --git a/landingPages/result/resultLanding.module.ts b/landingPages/result/resultLanding.module.ts
index 3ca8944a..2df31ec0 100644
--- a/landingPages/result/resultLanding.module.ts
+++ b/landingPages/result/resultLanding.module.ts
@@ -40,6 +40,7 @@ import {RecaptchaModule} from 'ng-recaptcha';
 import {SdgFosSuggestModule} from '../landing-utils/sdg-fos-suggest/sdg-fos-suggest.module';
 import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-screen-modal.module";
 import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
+import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
 
 @NgModule({
   imports: [
@@ -49,7 +50,7 @@ import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
     DeletedByInferenceModule, ShowAuthorsModule, HelperModule, ResultLandingUtilsModule, AlertModalModule,
     AnnotationModule, LandingHeaderModule, NoLoadPaging, ResultPreviewModule, FeedbackModule, TabsModule, LoadingModule,
     OrcidModule, MatFormFieldModule, MatSelectModule, IconsModule, InputModule, EGIDataTransferModule, RecaptchaModule,
-		SdgFosSuggestModule, FullScreenModalModule, SafeHtmlPipeModule
+    SdgFosSuggestModule, FullScreenModalModule, SafeHtmlPipeModule, EntityActionsModule
   ],
   declarations: [
     ResultLandingComponent
diff --git a/utils/entity-actions/entity-actions.component.ts b/utils/entity-actions/entity-actions.component.ts
index 126727d5..49dbe3a0 100644
--- a/utils/entity-actions/entity-actions.component.ts
+++ b/utils/entity-actions/entity-actions.component.ts
@@ -11,39 +11,48 @@ import {EnvProperties} from "../properties/env-properties";
   selector: 'entity-actions',
   template: `
     <div class="uk-grid uk-grid-small uk-child-width-auto" uk-grid>
-      <a *ngIf="linking && isRouteAvailable('participate/direct-claim')"
-         [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'], [id,type,linkTo])"
-         routerLinkActive="router-link-active" routerLink="/participate/direct-claim"
-         [title]="'Link '+openaireEntities.RESULTS+' with a '+openaireEntities.PROJECT+', a '+openaireEntities.COMMUNITY+' or other '+openaireEntities.RESULTS+' and make the new information available in OpenAIRE information space.'"
-         [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
-         class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-        <icon [flex]="true" [ratio]="0.7" name="link_to" visuallyHidden="link"></icon>
-        <span class="uk-margin-xsmall-left">Link to</span>
-      </a>
-      <a *ngIf="share" (click)="openAddThisModal()"
-         class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-        <icon [flex]="true" [ratio]="0.8" name="share" visuallyHidden="share"></icon>
-        <span class="uk-margin-xsmall-left">Share</span>
-      </a>
-      <a *ngIf="cite" (click)="openCiteModal()"
-         class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-        <icon [flex]="true" [ratio]="0.7" name="cite" visuallyHidden="cite"></icon>
-        <span class="uk-margin-xsmall-left">Cite</span>
-      </a>
-      <a *ngIf="deposit && isRouteAvailable('participate/deposit/learn-how')" routerLinkActive="router-link-active" routerLink="/participate/deposit/learn-how"
-         [title]="'Find a repository to deposit or publish your research in Open Access'"
-         [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
-         class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-        <icon flex="true" ratio="0.7" name="upload" visuallyHidden="upload"></icon>
-        <span class="uk-margin-xsmall-left">Deposit</span>
-      </a>
-      <a *ngIf="embed" (click)="openEmbedResultsModal()"
-				 [title]="'Embed the related '+openaireEntities.RESULTS+' of this '+getTypeName()+' in your website'"
-				 [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
-         class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
-        <icon flex="true" ratio="0.8" name="code" visuallyHidden="code"></icon>
-        <span class="uk-margin-xsmall-left">Embed</span>
-      </a>
+      <div *ngIf="linking && isRouteAvailable('participate/direct-claim')">
+        <a [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'], [id,type,linkTo])"
+           routerLinkActive="router-link-active" routerLink="/participate/direct-claim"
+           [title]="'Link '+openaireEntities.RESULTS+' with a '+openaireEntities.PROJECT+', a '+openaireEntities.COMMUNITY+' or other '+openaireEntities.RESULTS+' and make the new information available in OpenAIRE information space.'"
+           [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
+           class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
+          <icon [flex]="true" [ratio]="0.7" name="link_to" visuallyHidden="link"></icon>
+          <span class="uk-margin-xsmall-left">Link to</span>
+        </a>
+      </div>
+      <div *ngIf="share">
+        <a (click)="openAddThisModal()"
+           class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
+          <icon [flex]="true" [ratio]="0.8" name="share" visuallyHidden="share"></icon>
+          <span class="uk-margin-xsmall-left">Share</span>
+        </a>
+      </div>
+      <div *ngIf="cite">
+        <a (click)="openCiteModal()"
+            class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
+          <icon [flex]="true" [ratio]="0.7" name="cite" visuallyHidden="cite"></icon>
+          <span class="uk-margin-xsmall-left">Cite</span>
+        </a>
+      </div>
+      <div *ngIf="deposit && isRouteAvailable('participate/deposit/learn-how')">
+        <a routerLinkActive="router-link-active" routerLink="/participate/deposit/learn-how"
+           [title]="'Find a repository to deposit or publish your research in Open Access'"
+           [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
+           class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
+          <icon flex="true" ratio="0.7" name="upload" visuallyHidden="upload"></icon>
+          <span class="uk-margin-xsmall-left">Deposit</span>
+        </a>
+      </div>
+      <div *ngIf="embed" >
+        <a (click)="openEmbedResultsModal()"
+           [title]="'Embed the related '+openaireEntities.RESULTS+' of this '+getTypeName()+' in your website'"
+           [attr.uk-tooltip]="'pos: bottom; cls: uk-active  uk-text-small uk-padding-small uk-width-medium'"
+           class="uk-flex uk-flex-middle uk-flex-center uk-button-link uk-text-bolder">
+          <icon flex="true" ratio="0.8" name="code" visuallyHidden="code"></icon>
+          <span class="uk-margin-xsmall-left">Embed</span>
+        </a>
+      </div>
       <ng-content></ng-content>
     </div>
     <modal-alert *ngIf="cite" #citeModal>
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 86538ab0..9a6157fa 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -165,9 +165,7 @@
       <div *ngIf="result.hostedBy_collectedFrom || hasActions || result.measure?.bip.length || result.measure?.counts.length"
           class="uk-text-small uk-margin-top" [class.uk-border-bottom]="!isMobile"
            [class.uk-visible@m]="!result.measure?.bip.length && result.measure?.counts.length">
-        <div
-            class="uk-grid uk-grid-small uk-flex-between uk-text-xsmall uk-flex-middle uk-grid-divider uk-margin-xsmall-bottom"
-            uk-grid>
+        <div class="uk-grid uk-grid-small uk-flex-between uk-text-xsmall uk-flex-middle uk-grid-divider uk-margin-xsmall-bottom" uk-grid>
           <div *ngIf="result.hostedBy_collectedFrom?.length" class="uk-width-auto uk-visible@m">
             <availableOn [availableOn]="result.hostedBy_collectedFrom"></availableOn>
           </div>
@@ -177,26 +175,26 @@
                             [type]="result.resultType"
                             [result]="result" [id]="result.objId?result.objId:result.id"
                             [url]="properties.domain + properties.baseLink + url + '?' + urlParam + '=' + result.id">
-					<span *ngIf="orcid">
-						<orcid-work *ngIf="showOrcid && result.identifiers && result.identifiers.size > 0"
-                        [resultId]="result.relcanId" [resultTitle]="result.title"
-                        [type]="result.resultType" [pageType]="'search'"
-                        [putCodes]="result.orcidPutCodes" [givenPutCode]="true" [identifiers]="result.identifiers">
-						</orcid-work>
-					</span>
-              <span *ngIf="orcid" class="uk-width-expand uk-text-right">
-						<span *ngIf="result.orcidCreationDates?.length > 0" class="uk-display-inline-block">
-							<span class="uk-text-meta">
-								Added in ORCID:
-							</span>
-							<span *ngFor="let date of result.orcidCreationDates; let i=index">
-								{{date | date: 'dd MMM yyyy'}}
-                <span *ngIf="i < (result.orcidCreationDates.length - 1)">
-									&
-								</span>
-							</span>
-						</span>
-					</span>
+              <span *ngIf="orcid">
+                <orcid-work *ngIf="showOrcid && result.identifiers && result.identifiers.size > 0"
+                            [resultId]="result.relcanId" [resultTitle]="result.title"
+                            [type]="result.resultType" [pageType]="'search'"
+                            [putCodes]="result.orcidPutCodes" [givenPutCode]="true" [identifiers]="result.identifiers">
+                </orcid-work>
+              </span>
+                  <span *ngIf="orcid" class="uk-width-expand uk-text-right">
+                  <span *ngIf="result.orcidCreationDates?.length > 0" class="uk-display-inline-block">
+                    <span class="uk-text-meta">
+                      Added in ORCID:
+                    </span>
+                    <span *ngFor="let date of result.orcidCreationDates; let i=index">
+                      {{date | date: 'dd MMM yyyy'}}
+                      <span *ngIf="i < (result.orcidCreationDates.length - 1)">
+                        &
+                      </span>
+                    </span>
+                  </span>
+              </span>
             </entity-actions>
           </div>
           <div *ngIf="result.measure?.bip.length || result.measure?.counts.length"