diff --git a/extension.schema.json b/extension.schema.json
index 7d052744f..d536a3ee1 100644
--- a/extension.schema.json
+++ b/extension.schema.json
@@ -100,7 +100,7 @@
         },
         "contentActionRef": {
             "type": "object",
-            "required": ["id", "type"],
+            "required": ["id"],
             "properties": {
                 "id": {
                     "description": "Unique action identifier.",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index c3b546800..a5a1c39ec 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -76,7 +76,7 @@ import { DirectivesModule } from './directives/directives.module';
 import { ToggleInfoDrawerComponent } from './components/toolbar/toggle-info-drawer/toggle-info-drawer.component';
 import { DocumentDisplayModeComponent } from './components/toolbar/document-display-mode/document-display-mode.component';
 import { ToggleFavoriteComponent } from './components/toolbar/toggle-favorite/toggle-favorite.component';
-import { ContextMenuModule } from './context-menu/context-menu.module';
+import { ContextMenuModule } from './components/context-menu/context-menu.module';
 
 export function setupExtensionServiceFactory(service: ExtensionService): Function {
     return () => service.load();
diff --git a/src/app/context-menu/animations.ts b/src/app/components/context-menu/animations.ts
similarity index 100%
rename from src/app/context-menu/animations.ts
rename to src/app/components/context-menu/animations.ts
diff --git a/src/app/context-menu/context-menu-item.directive.ts b/src/app/components/context-menu/context-menu-item.directive.ts
similarity index 100%
rename from src/app/context-menu/context-menu-item.directive.ts
rename to src/app/components/context-menu/context-menu-item.directive.ts
diff --git a/src/app/context-menu/context-menu-overlay.ts b/src/app/components/context-menu/context-menu-overlay.ts
similarity index 100%
rename from src/app/context-menu/context-menu-overlay.ts
rename to src/app/components/context-menu/context-menu-overlay.ts
diff --git a/src/app/context-menu/context-menu.component.html b/src/app/components/context-menu/context-menu.component.html
similarity index 76%
rename from src/app/context-menu/context-menu.component.html
rename to src/app/components/context-menu/context-menu.component.html
index ca001a5ab..95d5fcb93 100644
--- a/src/app/context-menu/context-menu.component.html
+++ b/src/app/components/context-menu/context-menu.component.html
@@ -1,6 +1,16 @@
 <div mat-menu class="mat-menu-panel" @panelAnimation>
     <div class="mat-menu-content">
         <ng-container *ngFor="let entry of actions" [ngSwitch]="entry.type">
+            <ng-container *ngSwitchCase="'default'">
+                <button mat-menu-item
+                    [id]="entry.id"
+                    acaContextMenuItem
+                    (click)="runAction(entry.actions.click)">
+                    <mat-icon color="primary">{{ entry.icon }}</mat-icon>
+                    <span>{{ entry.title | translate }}</span>
+                </button>
+            </ng-container>
+
             <ng-container *ngSwitchCase="'button'">
                 <button mat-menu-item
                     [id]="entry.id"
diff --git a/src/app/context-menu/context-menu.component.scss b/src/app/components/context-menu/context-menu.component.scss
similarity index 100%
rename from src/app/context-menu/context-menu.component.scss
rename to src/app/components/context-menu/context-menu.component.scss
diff --git a/src/app/context-menu/context-menu.component.theme.scss b/src/app/components/context-menu/context-menu.component.theme.scss
similarity index 100%
rename from src/app/context-menu/context-menu.component.theme.scss
rename to src/app/components/context-menu/context-menu.component.theme.scss
diff --git a/src/app/context-menu/context-menu.component.ts b/src/app/components/context-menu/context-menu.component.ts
similarity index 93%
rename from src/app/context-menu/context-menu.component.ts
rename to src/app/components/context-menu/context-menu.component.ts
index d30a56fe0..c7bc016cc 100644
--- a/src/app/context-menu/context-menu.component.ts
+++ b/src/app/components/context-menu/context-menu.component.ts
@@ -31,15 +31,15 @@ import { trigger } from '@angular/animations';
 import { FocusKeyManager } from '@angular/cdk/a11y';
 import { DOWN_ARROW, UP_ARROW } from '@angular/cdk/keycodes';
 
-import { ExtensionService } from '../extensions/extension.service';
-import { AppStore, SelectionState } from '../store/states';
-import { appSelection } from '../store/selectors/app.selectors';
+import { ExtensionService } from '../../extensions/extension.service';
+import { AppStore, SelectionState } from '../../store/states';
+import { appSelection } from '../../store/selectors/app.selectors';
 import { Store } from '@ngrx/store';
 import { Subject } from 'rxjs/Rx';
 import { takeUntil } from 'rxjs/operators';
 
 import { ContextMenuOverlayRef } from './context-menu-overlay';
-import { ContentActionRef } from '../extensions/action.extensions';
+import { ContentActionRef } from '../../extensions/action.extensions';
 import { contextMenuAnimation } from './animations';
 import { ContextMenuItemDirective } from './context-menu-item.directive';
 
diff --git a/src/app/context-menu/context-menu.directive.ts b/src/app/components/context-menu/context-menu.directive.ts
similarity index 100%
rename from src/app/context-menu/context-menu.directive.ts
rename to src/app/components/context-menu/context-menu.directive.ts
diff --git a/src/app/context-menu/context-menu.module.ts b/src/app/components/context-menu/context-menu.module.ts
similarity index 96%
rename from src/app/context-menu/context-menu.module.ts
rename to src/app/components/context-menu/context-menu.module.ts
index bb769ce36..bc9bd6bfe 100644
--- a/src/app/context-menu/context-menu.module.ts
+++ b/src/app/components/context-menu/context-menu.module.ts
@@ -27,7 +27,7 @@ import { NgModule, ModuleWithProviders } from '@angular/core';
 import { MatMenuModule, MatListModule, MatIconModule, MatButtonModule } from '@angular/material';
 import { BrowserModule } from '@angular/platform-browser';
 import { CoreModule } from '@alfresco/adf-core';
-import { CoreExtensionsModule } from '../extensions/core.extensions.module';
+import { CoreExtensionsModule } from '../../extensions/core.extensions.module';
 
 import { ContextActionsDirective } from './context-menu.directive';
 import { ContextMenuService } from './context-menu.service';
diff --git a/src/app/context-menu/context-menu.service.ts b/src/app/components/context-menu/context-menu.service.ts
similarity index 100%
rename from src/app/context-menu/context-menu.service.ts
rename to src/app/components/context-menu/context-menu.service.ts
diff --git a/src/app/context-menu/interfaces.ts b/src/app/components/context-menu/interfaces.ts
similarity index 100%
rename from src/app/context-menu/interfaces.ts
rename to src/app/components/context-menu/interfaces.ts
diff --git a/src/app/extensions/components/toolbar/toolbar-action.component.html b/src/app/extensions/components/toolbar/toolbar-action.component.html
index 9a6f36050..387dfbb49 100644
--- a/src/app/extensions/components/toolbar/toolbar-action.component.html
+++ b/src/app/extensions/components/toolbar/toolbar-action.component.html
@@ -1,4 +1,8 @@
 <ng-container [ngSwitch]="entry.type">
+    <ng-container *ngSwitchCase="'default'">
+        <app-toolbar-button [type]="type" [actionRef]="entry"></app-toolbar-button>
+    </ng-container>
+
     <ng-container *ngSwitchCase="'button'">
         <app-toolbar-button [type]="type" [actionRef]="entry"></app-toolbar-button>
     </ng-container>
diff --git a/src/app/extensions/extension.service.ts b/src/app/extensions/extension.service.ts
index 99f799e50..cc5f13cf4 100644
--- a/src/app/extensions/extension.service.ts
+++ b/src/app/extensions/extension.service.ts
@@ -125,7 +125,7 @@ export class ExtensionService implements RuleContext {
         this.routes = this.loadRoutes(config);
         this.contentActions = this.loadContentActions(config);
         this.viewerActions = this.loadViewerActions(config);
-        this.contentContextmenuActions = this.loadContentContextmenuActions(config);
+        this.contentContextmenuActions = this.loadContentContextMenuActions(config);
         this.openWithActions = this.loadViewerOpenWith(config);
         this.createActions = this.loadCreateActions(config);
         this.navbar = this.loadNavBar(config);
@@ -159,26 +159,27 @@ export class ExtensionService implements RuleContext {
 
     protected loadContentActions(config: ExtensionConfig) {
         if (config && config.features && config.features.content) {
-            return (config.features.content.actions || []).sort(
-                this.sortByOrder
-            );
+            return (config.features.content.actions || [])
+                .sort(this.sortByOrder)
+                .map(this.setActionDefaults);
         }
         return [];
     }
 
     protected loadViewerActions(config: ExtensionConfig) {
         if (config && config.features && config.features.viewer) {
-            return (config.features.viewer.actions || []).sort(
-                this.sortByOrder
-            );
+            return (config.features.viewer.actions || [])
+                .sort(this.sortByOrder)
+                .map(this.setActionDefaults);
         }
         return [];
     }
 
-    protected loadContentContextmenuActions(config: ExtensionConfig): Array<ContentActionRef> {
+    protected loadContentContextMenuActions(config: ExtensionConfig): Array<ContentActionRef> {
         if (config && config.features && config.features.content) {
             return (config.features.content.contextActions || [])
-                .sort(this.sortByOrder);
+                .sort(this.sortByOrder)
+                .map(this.setActionDefaults);
         }
         return [];
     }
@@ -351,6 +352,14 @@ export class ExtensionService implements RuleContext {
             .filter(action => this.filterByRules(action));
     }
 
+    setActionDefaults(action: ContentActionRef): ContentActionRef {
+        if (action) {
+            action.type = action.type || ContentActionType.default;
+            action.icon = action.icon || 'extension';
+        }
+        return action;
+    }
+
     reduceSeparators(
         acc: ContentActionRef[],
         el: ContentActionRef,
diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss
index 63bd92a46..ca9442df0 100644
--- a/src/app/ui/custom-theme.scss
+++ b/src/app/ui/custom-theme.scss
@@ -8,8 +8,8 @@
 @import '../components/settings/settings.component.theme';
 @import '../components/current-user/current-user.component.theme';
 @import '../components/permission-manager/permissions-manager.component.theme';
+@import '../components/context-menu/context-menu.component.theme';
 @import '../dialogs/node-versions/node-versions.dialog.theme';
-@import '../context-menu/context-menu.component.theme';
 
 @import './overrides/adf-toolbar.theme';
 @import './overrides/adf-search-filter.theme';
diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json
index a2614e538..3060c0a0f 100644
--- a/src/assets/app.extensions.json
+++ b/src/assets/app.extensions.json
@@ -135,7 +135,6 @@
         "create": [
             {
                 "id": "app.create.folder",
-                "type": "default",
                 "order": 100,
                 "icon": "create_new_folder",
                 "title": "APP.NEW_MENU.MENU_ITEMS.CREATE_FOLDER",
@@ -150,7 +149,6 @@
             },
             {
                 "id": "app.create.uploadFile",
-                "type": "default",
                 "order": 200,
                 "icon": "file_upload",
                 "title": "APP.NEW_MENU.MENU_ITEMS.UPLOAD_FILE",
@@ -165,7 +163,6 @@
             },
             {
                 "id": "app.create.uploadFolder",
-                "type": "default",
                 "order": 300,
                 "icon": "file_upload",
                 "title": "APP.NEW_MENU.MENU_ITEMS.UPLOAD_FOLDER",
@@ -243,7 +240,6 @@
             "actions": [
                 {
                     "id": "app.toolbar.preview",
-                    "type": "button",
                     "order": 100,
                     "title": "APP.ACTIONS.VIEW",
                     "icon": "open_in_browser",
@@ -256,7 +252,6 @@
                 },
                 {
                     "id": "app.toolbar.download",
-                    "type": "button",
                     "order": 200,
                     "title": "APP.ACTIONS.DOWNLOAD",
                     "icon": "get_app",
@@ -269,7 +264,6 @@
                 },
                 {
                     "id": "app.toolbar.editFolder",
-                    "type": "button",
                     "order": 300,
                     "title": "APP.ACTIONS.EDIT",
                     "icon": "create",
@@ -282,7 +276,6 @@
                 },
                 {
                     "id": "app.toolbar.purgeDeletedNodes",
-                    "type": "button",
                     "order": 400,
                     "title": "APP.ACTIONS.DELETE_PERMANENT",
                     "icon": "delete_forever",
@@ -295,7 +288,6 @@
                 },
                 {
                     "id": "app.toolbar.restoreDeletedNodes",
-                    "type": "button",
                     "order": 500,
                     "title": "APP.ACTIONS.RESTORE",
                     "icon": "restore",
@@ -308,7 +300,6 @@
                 },
                 {
                     "id": "app.toolbar.createLibrary",
-                    "type": "button",
                     "order": 600,
                     "title": "Create Library",
                     "icon": "create_new_folder",
@@ -347,7 +338,6 @@
                         },
                         {
                             "id": "app.toolbar.favorite.add",
-                            "type": "button",
                             "order": 200,
                             "title": "APP.ACTIONS.FAVORITE",
                             "icon": "star_border",
@@ -360,7 +350,6 @@
                         },
                         {
                             "id": "app.toolbar.favorite.remove",
-                            "type": "button",
                             "order": 300,
                             "title": "APP.ACTIONS.FAVORITE",
                             "icon": "star",
@@ -373,7 +362,6 @@
                         },
                         {
                             "id": "app.toolbar.copy",
-                            "type": "button",
                             "order": 400,
                             "title": "APP.ACTIONS.COPY",
                             "icon": "content_copy",
@@ -386,7 +374,6 @@
                         },
                         {
                             "id": "app.toolbar.move",
-                            "type": "button",
                             "order": 500,
                             "title": "APP.ACTIONS.MOVE",
                             "icon": "library_books",
@@ -399,7 +386,6 @@
                         },
                         {
                             "id": "app.toolbar.share",
-                            "type": "button",
                             "order": 600,
                             "title": "APP.ACTIONS.SHARE",
                             "icon": "share",
@@ -412,7 +398,6 @@
                         },
                         {
                             "id": "app.toolbar.unshare",
-                            "type": "button",
                             "order": 700,
                             "title": "APP.ACTIONS.UNSHARE",
                             "icon": "stop_screen_share",
@@ -425,7 +410,6 @@
                         },
                         {
                             "id": "app.toolbar.delete",
-                            "type": "button",
                             "order": 800,
                             "title": "APP.ACTIONS.DELETE",
                             "icon": "delete",
@@ -438,7 +422,6 @@
                         },
                         {
                             "id": "app.toolbar.deleteLibrary",
-                            "type": "button",
                             "order": 900,
                             "title": "APP.ACTIONS.DELETE",
                             "icon": "delete",
@@ -451,7 +434,6 @@
                         },
                         {
                             "id": "app.toolbar.versions",
-                            "type": "button",
                             "order": 1000,
                             "title": "APP.ACTIONS.VERSIONS",
                             "icon": "history",
@@ -464,7 +446,6 @@
                         },
                         {
                             "id": "app.toolbar.permissions",
-                            "type": "button",
                             "order": 1100,
                             "title": "APP.ACTIONS.PERMISSIONS",
                             "icon": "settings_input_component",
@@ -481,7 +462,6 @@
             "contextActions": [
                 {
                     "id": "app.contextmenu.download",
-                    "type": "button",
                     "order": 100,
                     "title": "APP.ACTIONS.DOWNLOAD",
                     "icon": "get_app",
@@ -494,7 +474,6 @@
                 },
                 {
                     "id": "app.contextmenu.preview",
-                    "type": "button",
                     "order": 200,
                     "title": "APP.ACTIONS.VIEW",
                     "icon": "open_in_browser",
@@ -507,7 +486,6 @@
                 },
                 {
                     "id": "app.contextmenu.editFolder",
-                    "type": "button",
                     "order": 300,
                     "title": "APP.ACTIONS.EDIT",
                     "icon": "create",
@@ -520,7 +498,6 @@
                 },
                 {
                     "id": "app.contextmenu.share",
-                    "type": "button",
                     "title": "APP.ACTIONS.SHARE",
                     "order": 400,
                     "icon": "share",
@@ -533,7 +510,6 @@
                 },
                 {
                     "id": "app.contextmenu.favorite.add",
-                    "type": "button",
                     "title": "APP.ACTIONS.FAVORITE",
                     "order": 500,
                     "icon": "star_border",
@@ -546,7 +522,6 @@
                 },
                 {
                     "id": "app.contextmenu.favorite.remove",
-                    "type": "button",
                     "title": "APP.ACTIONS.FAVORITE",
                     "order": 600,
                     "icon": "star",
@@ -559,7 +534,6 @@
                 },
                 {
                     "id": "app.contextmenu.copy",
-                    "type": "button",
                     "title": "APP.ACTIONS.COPY",
                     "order": 700,
                     "icon": "content_copy",
@@ -572,7 +546,6 @@
                 },
                 {
                     "id": "app.contextmenu.move",
-                    "type": "button",
                     "title": "APP.ACTIONS.MOVE",
                     "order": 800,
                     "icon": "library_books",
@@ -585,7 +558,6 @@
                 },
                 {
                     "id": "app.contextmenu.delete",
-                    "type": "button",
                     "title": "APP.ACTIONS.DELETE",
                     "order": 900,
                     "icon": "delete",
@@ -598,7 +570,6 @@
                 },
                 {
                     "id": "app.contextmenu.versions",
-                    "type": "button",
                     "title": "APP.ACTIONS.VERSIONS",
                     "order": 1000,
                     "icon": "history",
@@ -611,7 +582,6 @@
                 },
                 {
                     "id": "app.contextmenu.permissions",
-                    "type": "button",
                     "title": "APP.ACTIONS.PERMISSIONS",
                     "icon": "settings_input_component",
                     "order": 1100,
@@ -624,7 +594,6 @@
                 },
                 {
                     "id": "app.contextmenu.purgeDeletedNodes",
-                    "type": "button",
                     "order": 1200,
                     "title": "APP.ACTIONS.DELETE_PERMANENT",
                     "icon": "delete_forever",
@@ -637,7 +606,6 @@
                 },
                 {
                     "id": "app.contextmenu.restoreDeletedNodes",
-                    "type": "button",
                     "order": 1300,
                     "title": "APP.ACTIONS.RESTORE",
                     "icon": "restore",
@@ -654,7 +622,6 @@
             "actions": [
                 {
                     "id": "app.viewer.favorite.add",
-                    "type": "button",
                     "order": 100,
                     "title": "APP.ACTIONS.FAVORITE",
                     "icon": "star_border",
@@ -667,7 +634,6 @@
                 },
                 {
                     "id": "app.viewer.favorite.remove",
-                    "type": "button",
                     "order": 200,
                     "title": "APP.ACTIONS.FAVORITE",
                     "icon": "star",
@@ -680,7 +646,6 @@
                 },
                 {
                     "id": "app.viewer.share",
-                    "type": "button",
                     "order": 300,
                     "title": "APP.ACTIONS.SHARE",
                     "icon": "share",
@@ -693,7 +658,6 @@
                 },
                 {
                     "id": "app.viewer.copy",
-                    "type": "button",
                     "order": 400,
                     "title": "APP.ACTIONS.COPY",
                     "icon": "content_copy",
@@ -706,7 +670,6 @@
                 },
                 {
                     "id": "app.viewer.move",
-                    "type": "button",
                     "order": 500,
                     "title": "APP.ACTIONS.MOVE",
                     "icon": "library_books",
@@ -719,7 +682,6 @@
                 },
                 {
                     "id": "app.viewer.delete",
-                    "type": "button",
                     "order": 600,
                     "title": "APP.ACTIONS.DELETE",
                     "icon": "delete",
@@ -732,7 +694,6 @@
                 },
                 {
                     "id": "app.viewer.versions",
-                    "type": "button",
                     "order": 700,
                     "title": "APP.ACTIONS.VERSIONS",
                     "icon": "history",
@@ -745,7 +706,6 @@
                 },
                 {
                     "id": "app.viewer.permissions",
-                    "type": "button",
                     "order": 800,
                     "title": "APP.ACTIONS.PERMISSIONS",
                     "icon": "settings_input_component",