diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index abe86723b10..12be93a4201 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -143,6 +143,7 @@ export class MenuId {
 	static readonly CommentTitle = new MenuId('CommentTitle');
 	static readonly CommentActions = new MenuId('CommentActions');
 	static readonly NotebookToolbar = new MenuId('NotebookToolbar');
+	static readonly NotebookRightToolbar = new MenuId('NotebookRightToolbar');
 	static readonly NotebookCellTitle = new MenuId('NotebookCellTitle');
 	static readonly NotebookCellInsert = new MenuId('NotebookCellInsert');
 	static readonly NotebookCellBetween = new MenuId('NotebookCellBetween');
diff --git a/src/vs/workbench/api/common/menusExtensionPoint.ts b/src/vs/workbench/api/common/menusExtensionPoint.ts
index 3046d981ff3..7b3a989c920 100644
--- a/src/vs/workbench/api/common/menusExtensionPoint.ts
+++ b/src/vs/workbench/api/common/menusExtensionPoint.ts
@@ -182,6 +182,12 @@ const apiMenus: IAPIMenu[] = [
 		description: localize('notebook.toolbar', "The contributed notebook toolbar menu"),
 		proposed: true
 	},
+	{
+		key: 'notebook/toolbar/right',
+		id: MenuId.NotebookRightToolbar,
+		description: localize('notebook.toolbar.right', "The contributed notebook right toolbar menu"),
+		proposed: true
+	},
 	{
 		key: 'notebook/cell/title',
 		id: MenuId.NotebookCellTitle,
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
index 059c703ab37..f8e5427ebdc 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
@@ -34,6 +34,7 @@ import { NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewMod
 import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
 import { Iterable } from 'vs/base/common/iterator';
 import { flatten } from 'vs/base/common/arrays';
+import { Codicon } from 'vs/base/common/codicons';
 
 // Kernel Command
 export const SELECT_KERNEL_ID = 'notebook.selectKernel';
@@ -684,7 +685,7 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
 				{
 					id: MenuId.NotebookToolbar,
 					order: -1,
-					group: 'navigation',
+					group: 'navigation/execute',
 					when: ContextKeyExpr.and(
 						executeNotebookCondition,
 						ContextKeyExpr.or(NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated(), NOTEBOOK_HAS_RUNNING_CELL.toNegated()),
@@ -755,7 +756,7 @@ registerAction2(class CancelNotebook extends NotebookAction {
 				{
 					id: MenuId.NotebookToolbar,
 					order: -1,
-					group: 'navigation',
+					group: 'navigation/execute',
 					when: ContextKeyExpr.and(
 						NOTEBOOK_HAS_RUNNING_CELL,
 						NOTEBOOK_INTERRUPTIBLE_KERNEL,
@@ -916,7 +917,13 @@ abstract class InsertCellCommand extends NotebookAction {
 	}
 
 	async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
-		context.notebookEditor.insertNotebookCell(context.cell, this.kind, this.direction, undefined, true);
+		if (context.cell) {
+			context.notebookEditor.insertNotebookCell(context.cell, this.kind, this.direction, undefined, true);
+		} else {
+			const focusRange = context.notebookEditor.getFocus();
+			const next = focusRange.end - 1;
+			context.notebookEditor.insertNotebookCell(context.notebookEditor.viewModel.viewCells[next], this.kind, this.direction, undefined, true);
+		}
 	}
 }
 
@@ -1023,6 +1030,18 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
 	when: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
 });
 
+MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
+	command: {
+		id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
+		icon: Codicon.add,
+		title: localize('notebookActions.menu.insertCode.ontoolbar', "Code"),
+		tooltip: localize('notebookActions.menu.insertCode.tooltip', "Add Code Cell")
+	},
+	order: -5,
+	group: 'navigation/add',
+	when: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
+});
+
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
 	command: {
 		id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
@@ -1077,6 +1096,18 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
 	when: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
 });
 
+MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
+	command: {
+		id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
+		icon: Codicon.add,
+		title: localize('notebookActions.menu.insertMarkdown.ontoolbar', "Markdown"),
+		tooltip: localize('notebookActions.menu.insertMarkdown.tooltip', "Add Markdown Cell")
+	},
+	order: -5,
+	group: 'navigation/add',
+	when: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
+});
+
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
 	command: {
 		id: INSERT_MARKDOWN_CELL_AT_TOP_COMMAND_ID,
@@ -1503,7 +1534,7 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
 				{
 					id: MenuId.NotebookToolbar,
 					when: ContextKeyExpr.equals('config.notebook.experimental.globalToolbar', true),
-					group: 'navigation',
+					group: 'navigation/execute',
 					order: 0
 				}
 			],
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts b/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
index 3cd8440458b..2e2ce57d5eb 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
@@ -37,12 +37,27 @@ registerAction2(class extends Action2 {
 			precondition: NOTEBOOK_IS_ACTIVE_EDITOR,
 			icon: selectKernelIcon,
 			f1: true,
-			menu: {
+			menu: [{
 				id: MenuId.EditorTitle,
-				when: ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT.notEqualsTo(0), ContextKeyExpr.equals('config.notebook.experimental.showKernelInEditorTitle', true),),
+				when: ContextKeyExpr.and(
+					NOTEBOOK_IS_ACTIVE_EDITOR,
+					NOTEBOOK_KERNEL_COUNT.notEqualsTo(0),
+					ContextKeyExpr.equals('config.notebook.experimental.showKernelInEditorTitle', true),
+					ContextKeyExpr.notEquals('config.notebook.experimental.globalToolbar', true)
+				),
 				group: 'navigation',
 				order: -10
-			},
+			}, {
+				id: MenuId.NotebookToolbar,
+				when: ContextKeyExpr.and(
+					NOTEBOOK_IS_ACTIVE_EDITOR,
+					NOTEBOOK_KERNEL_COUNT.notEqualsTo(0),
+					ContextKeyExpr.equals('config.notebook.experimental.showKernelInEditorTitle', true),
+					ContextKeyExpr.equals('config.notebook.experimental.globalToolbar', true)
+				),
+				group: 'status',
+				order: -10
+			}],
 			description: {
 				description: nls.localize('notebookActions.selectKernel.args', "Notebook Kernel Args"),
 				args: [