diff --git a/src/app/components/preview/preview.component.html b/src/app/components/preview/preview.component.html
index 0e3eb9a5e..4e9ade295 100644
--- a/src/app/components/preview/preview.component.html
+++ b/src/app/components/preview/preview.component.html
@@ -21,7 +21,7 @@
 
         <adf-viewer-open-with *ngIf="openWith.length">
             <ng-container *ngFor="let action of openWith; trackBy: trackByActionId">
-                <aca-toolbar-action type="menu-item" [actionRef]="action"></aca-toolbar-action>
+              <app-toolbar-menu-item [actionRef]="action"></app-toolbar-menu-item>
             </ng-container>
         </adf-viewer-open-with>
 
@@ -33,7 +33,7 @@
 
         <adf-viewer-more-actions *ngIf="viewerToolbarMoreActions.length">
             <ng-container *ngFor="let action of viewerToolbarMoreActions; trackBy: trackByActionId">
-                <aca-toolbar-action type="menu-item" [actionRef]="action"></aca-toolbar-action>
+                <app-toolbar-menu-item [actionRef]="action"></app-toolbar-menu-item>
             </ng-container>
         </adf-viewer-more-actions>
 
diff --git a/src/app/components/preview/preview.component.scss b/src/app/components/preview/preview.component.scss
index 74f765b7d..69d1ddb3c 100644
--- a/src/app/components/preview/preview.component.scss
+++ b/src/app/components/preview/preview.component.scss
@@ -4,7 +4,7 @@
 }
 
 .hide-last-divider .adf-viewer-toolbar .mat-toolbar {
-  adf-toolbar-divider:last-of-type {
+  > adf-toolbar-divider:last-of-type {
     display: none;
   }
 
@@ -16,3 +16,9 @@
 #adf-viewer-moreactions {
   right: -40px;
 }
+
+.adf-viewer-toolbar-actions {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json
index 15b0c0825..220894325 100644
--- a/src/assets/app.extensions.json
+++ b/src/assets/app.extensions.json
@@ -842,7 +842,7 @@
       "toolbarActions": [
         {
           "id": "app.viewer.download",
-          "order": 200,
+          "order": 300,
           "title": "APP.ACTIONS.DOWNLOAD",
           "icon": "get_app",
           "actions": {
@@ -854,7 +854,7 @@
         },
         {
           "id": "app.viewer.print",
-          "order": 300,
+          "order": 400,
           "title": "APP.ACTIONS.PRINT",
           "icon": "print",
           "actions": {
@@ -866,7 +866,7 @@
         },
         {
           "id": "app.viewer.share",
-          "order": 400,
+          "order": 200,
           "title": "APP.ACTIONS.SHARE",
           "icon": "share",
           "actions": {
@@ -878,7 +878,7 @@
         },
         {
           "id": "app.viewer.share.edit",
-          "order": 401,
+          "order": 201,
           "title": "APP.ACTIONS.SHARE_EDIT",
           "icon": "share",
           "actions": {
@@ -899,6 +899,11 @@
           "rules": {
             "visible": "app.toolbar.canViewFile"
           }
+        },
+        {
+          "id": "app.viewer.separator.1",
+          "type": "separator",
+          "order": 180
         }
       ],
       "toolbarMoreMenu": [
@@ -936,6 +941,11 @@
             "visible": "app.toolbar.favorite.canToggle"
           }
         },
+        {
+          "id": "app.viewer.more.separator.1",
+          "type": "separator",
+          "order": 280
+        },
         {
           "id": "app.viewer.copy",
           "order": 400,
@@ -972,6 +982,11 @@
             "visible": "app.selection.canDelete"
           }
         },
+        {
+          "id": "app.viewer.more.separator.2",
+          "type": "separator",
+          "order": 680
+        },
         {
           "id": "app.viewer.versions",
           "order": 700,