diff --git a/src/components/Container/Page.vue b/src/components/Container/Page.vue
index 803ca8658..df503d541 100644
--- a/src/components/Container/Page.vue
+++ b/src/components/Container/Page.vue
@@ -45,51 +45,7 @@ export default {
 			unreadTasksCount: 0,
 		};
 	},
-	computed: {
-		/**
-		 * The menu item entry for a back-to-dashboard link
-		 *
-		 * @return {Object|null}
-		 */
-		backToDashboardLink() {
-			if (this.useBackToDashboard) {
-				return this.menu[Object.keys(this.menu)[0]];
-			}
-			return null;
-		},
-
-		/**
-		 * The new label for the back-to-dashboard link
-		 *
-		 * Converts "Submissions" to "Back to Submissions"
-		 *
-		 * @return {String}
-		 */
-		backToDashboardLabel() {
-			if (this.backToDashboardLink) {
-				return this.t('navigation.backTo', {
-					page: this.backToDashboardLink.name,
-				});
-			}
-			return null;
-		},
-
-		/**
-		 * Should a back-to-dashboard link be shown instead of a
-		 * full navigation menu?
-		 *
-		 * This is the case when the nav menu contains only one link.
-		 *
-		 * @return {Boolean}
-		 */
-		useBackToDashboard() {
-			return (
-				!!this.menu &&
-				Object.keys(this.menu).length === 1 &&
-				!this.menu[Object.keys(this.menu)[0]].isCurrent
-			);
-		},
-	},
+	computed: {},
 	mounted() {
 		/**
 		 * Fire a callback when the URL #hash is changed
diff --git a/src/components/Container/SubmissionWizardPage.vue b/src/components/Container/SubmissionWizardPage.vue
index 7c9c71872..fa8c02847 100644
--- a/src/components/Container/SubmissionWizardPage.vue
+++ b/src/components/Container/SubmissionWizardPage.vue
@@ -90,6 +90,10 @@ export default {
 			i18nUnsavedChanges: '',
 			/** **Required** A localized string for the message of the dialog that appears when unsaved changes are found in local storage. */
 			i18nUnsavedChangesMessage: '',
+			/** The URL to the REST API endpoint to cancel this submission. */
+			submissionCancelApiUrl: '',
+			/** The URL to the page to display after a submission is cancelled. */
+			submissionCancelledUrl: '',
 		};
 	},
 	computed: {
@@ -782,6 +786,52 @@ export default {
 				});
 			}, 500);
 		},
+
+		/**
+		 * Cancel a submission.
+		 */
+		cancelSubmission(){
+			this.openDialog({
+				name: 'SubmissionCancel',
+				title: this.t('submission.wizard.submissionCancel'),
+				message: this.t('submission.wizard.cancel.confirmation'),
+				actions: [
+					{
+						label: this.t('common.ok'),
+						isPrimary: true,
+						callback: (close) => {
+							$.ajax({
+								url: this.submissionCancelApiUrl,
+								context: this,
+								method: 'POST',
+								headers: {
+									'X-Csrf-Token': pkp.currentUser.csrfToken,
+									'X-Http-Method-Override': 'DELETE',
+								},
+								error(r) {
+									close();
+
+									if (!r.responseJSON) {
+										this.ajaxErrorCallback({});
+									} else {
+										this.errors = r.responseJSON;
+									}
+								},
+								success() {
+									window.location = this.submissionCancelledUrl;
+								},
+							});
+						},
+					},
+					{
+						label: this.t('common.cancel'),
+						isWarnable: true,
+						callback: (close) => close(),
+					},
+				],
+				modalStyle: 'negative',
+			});
+		}
 	},
 };
 </script>
diff --git a/src/components/DropdownActions/DropdownActions.vue b/src/components/DropdownActions/DropdownActions.vue
index f25566f33..2b1737629 100644
--- a/src/components/DropdownActions/DropdownActions.vue
+++ b/src/components/DropdownActions/DropdownActions.vue
@@ -1,30 +1,22 @@
 <template>
-	<div class="relative inline-block items-start justify-between">
+	<div
+		class="relative inline-block items-start justify-between"
+		:class="{'leading-none': displayAsEllipsis}"
+	>
 		<Menu as="div">
-			<div>
-				<MenuButton
-					class="hover:bg-gray-50 inline-flex w-full justify-center gap-x-1.5 rounded"
-					:class="
-						displayAsEllipsis
-							? 'text-3xl-normal'
-							: 'border border-light bg-secondary px-3 py-2 text-lg-normal'
-					"
-					:aria-label="ariaLabel || null"
-				>
-					<span v-if="!displayAsEllipsis">{{ label }}</span>
-					<Icon
-						v-if="!displayAsEllipsis"
-						class="h-5 w-5 text-primary"
-						icon="Dropdown"
-						aria-hidden="true"
-					/>
-					<ButtonIcon
-						v-else
-						icon="MoreOptions"
-						:aria-label="label"
-					></ButtonIcon>
-				</MenuButton>
-			</div>
+			<MenuButton
+				:class="menuButtonStyle"
+				:aria-label="displayAsEllipsis ? label : ariaLabel"
+			>
+				<span v-if="!displayAsEllipsis">{{ label }}</span>
+				<Icon
+					v-if="!displayAsEllipsis"
+					class="h-5 w-5 text-primary"
+					icon="Dropdown"
+					aria-hidden="true"
+				/>
+				<Icon v-else class="h-6 w-6" icon="MoreOptions" aria-hidden="true" />
+			</MenuButton>
 
 			<transition
 				enter-active-class="transition ease-out duration-100"
@@ -80,10 +72,10 @@
 <script setup>
 import {Menu, MenuButton, MenuItem, MenuItems} from '@headlessui/vue';
 import PkpButton from '@/components/Button/Button.vue';
-import ButtonIcon from '@/components/ButtonIcon/ButtonIcon.vue';
 import Icon from '@/components/Icon/Icon.vue';
+import {computed} from 'vue';
 
-defineProps({
+const props = defineProps({
 	/**
 	 * An array of action objects.
 	 * Each object should contain
@@ -140,6 +132,16 @@ const emitAction = (action) => {
 	}
 };
 
+const menuButtonStyle = computed(() => ({
+	// Base
+	'hover:bg-gray-50 w-full justify-center rounded': true,
+	// Default
+	'inline-flex border border-light bg-secondary px-3 py-2 text-lg-normal gap-x-1.5':
+		!props.displayAsEllipsis,
+	// Ellipsis Menu
+	'leading-none hover:text-on-dark hover:bg-hover': props.displayAsEllipsis,
+}));
+
 const isValidAction = (action) => {
 	return action?.label && (action?.url || action?.name);
 };
diff --git a/src/components/Form/fields/Autosuggest.vue b/src/components/Form/fields/Autosuggest.vue
index 7aaa32b22..baae16518 100644
--- a/src/components/Form/fields/Autosuggest.vue
+++ b/src/components/Form/fields/Autosuggest.vue
@@ -103,7 +103,7 @@
 	</Combobox>
 </template>
 <script setup>
-import {useSlots, ref, inject, computed} from 'vue';
+import {useSlots, ref, computed} from 'vue';
 import {
 	Combobox,
 	ComboboxInput,
@@ -157,6 +157,11 @@ const props = defineProps({
 		type: Boolean,
 		default: () => true,
 	},
+	/** If custom items can be selected */
+	allowCustom: {
+		type: Boolean,
+		default: () => false,
+	},
 	/** Field input id, usually used to connect with FormFieldLabel  */
 	inputId: {type: String, required: false, default: null},
 	/** aria-describedby ids */
@@ -189,7 +194,6 @@ const emit = defineEmits([
 	'deselect',
 ]);
 
-const allowCustom = inject('allowCustom', false);
 const localInputValue = ref('');
 const isFocused = ref(false);
 
diff --git a/src/components/Form/fields/FieldBaseAutosuggest.vue b/src/components/Form/fields/FieldBaseAutosuggest.vue
index 4d4a6e1b6..f059a6417 100644
--- a/src/components/Form/fields/FieldBaseAutosuggest.vue
+++ b/src/components/Form/fields/FieldBaseAutosuggest.vue
@@ -189,6 +189,11 @@ export default {
 			type: Boolean,
 			default: () => true,
 		},
+		/** If custom items can be selected */
+		allowCustom: {
+			type: Boolean,
+			default: () => false,
+		},
 	},
 	data() {
 		return {
@@ -257,6 +262,7 @@ export default {
 				isDisabled: this.isDisabled,
 				inputId: this.controlId,
 				describedBy: this.describedByIds,
+				allowCustom: this.allowCustom,
 			};
 		},
 	},
diff --git a/src/components/Form/fields/FieldControlledVocab.vue b/src/components/Form/fields/FieldControlledVocab.vue
index b5f2939fc..e213f6a3e 100644
--- a/src/components/Form/fields/FieldControlledVocab.vue
+++ b/src/components/Form/fields/FieldControlledVocab.vue
@@ -1,13 +1,16 @@
 <script>
-import {provide} from 'vue';
 import FieldBaseAutosuggest from './FieldBaseAutosuggest.vue';
 import debounce from 'debounce';
 
 export default {
 	name: 'FieldControlledVocab',
 	extends: FieldBaseAutosuggest,
-	setup() {
-		provide('allowCustom', true);
+	props: {
+		/** An array of options to suggest. */
+		allowCustom: {
+			type: Boolean,
+			default: true,
+		},
 	},
 	data() {
 		return {
diff --git a/src/components/Form/fields/FieldRorAutosuggest.vue b/src/components/Form/fields/FieldRorAutosuggest.vue
index b7413c559..356f3cfae 100644
--- a/src/components/Form/fields/FieldRorAutosuggest.vue
+++ b/src/components/Form/fields/FieldRorAutosuggest.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script setup>
-import {ref, watch, computed, provide} from 'vue';
+import {ref, watch, computed} from 'vue';
 import Autosuggest from './Autosuggest.vue';
 import Icon from '@/components/Icon/Icon.vue';
 import {useFetch} from '@/composables/useFetch';
@@ -70,8 +70,6 @@ const queryParams = computed(() => ({
 	query: inputValue.value,
 }));
 
-provide('allowCustom', true);
-
 const autosuggestContainerId = generateId();
 
 const {
@@ -87,6 +85,7 @@ const staticProps = {
 	selectedLabel: 'Selected',
 	isMultiple: false,
 	describedBy: autosuggestContainerId,
+	allowCustom: true,
 };
 
 const autoSuggestProps = computed(() => ({
diff --git a/src/components/Modal/Dialog.vue b/src/components/Modal/Dialog.vue
index ac41ef190..b04ca5729 100644
--- a/src/components/Modal/Dialog.vue
+++ b/src/components/Modal/Dialog.vue
@@ -66,7 +66,6 @@
 								class="flex items-center gap-x-4"
 								:class="icon ? 'p-10 ps-24' : 'p-12'"
 							>
-								<Spinner v-if="isLoading" />
 								<PkpButton
 									v-for="action in actions"
 									:key="action.label"
@@ -81,6 +80,7 @@
 								>
 									{{ action.label }}
 								</PkpButton>
+								<Spinner v-if="isLoading" />
 							</div>
 						</DialogPanel>
 					</TransitionChild>
diff --git a/src/composables/useFetch.js b/src/composables/useFetch.js
index 424840806..477d877ba 100644
--- a/src/composables/useFetch.js
+++ b/src/composables/useFetch.js
@@ -18,6 +18,32 @@ export function getCSRFToken() {
 	return FALLBACK_TOKEN;
 }
 
+/**
+ * This workaround addresses the limitation where ofetch does not handle array query params in PHP friendly way.
+ * Once this issue is resolved in ofetch, this function can be removed.
+ * Fo reference see:
+ * - https://github.com/unjs/ufo/issues/185
+ * - https://github.com/unjs/ufo/issues/208
+ * - https://github.com/unjs/ofetch/pull/440
+ * 
+ */
+function _formatQueryParams(params) {
+	if (!params) {
+		return {}
+	}
+
+	const formatedParams = {};
+	Object.entries(params).forEach(([key, value]) => {
+		if (Array.isArray(value)) {
+			formatedParams[`${key}[]`] = value;
+		} else {
+			formatedParams[key] = value;
+		}
+	});
+
+	return formatedParams;
+}
+
 /**
  *
  * Composable for handling API requests
@@ -39,6 +65,10 @@ export function getCSRFToken() {
  * @returns {Ref<boolean>} return.isLoading - A ref object indicating whether the fetch operation is currently in progress.
  * @returns {Function} return.fetch - The function to call to initiate the fetch operation. This function is async and handles the actual fetching logic.
  *
+ *  * The `fetch` function accepts the following optional parameter:
+ * @param {Object} [fetchOptions={}] - Options to customize the fetch operation.
+ * @param {boolean} [fetchOptions.clearData=false] - If set to `true`, processes and cleans the fetched data before storing it in `data`. Defaults to `false`.
+ 
  */
 export function useFetch(url, options = {}) {
 	/**
@@ -72,7 +102,7 @@ export function useFetch(url, options = {}) {
 	const screenName = modalLevel?.value ? `modal_${modalLevel.value}` : 'base';
 	const progressStore = useProgressStore();
 
-	async function _fetch() {
+	async function _fetch({clearData} = {clearData: false}) {
 		if (lastRequestController) {
 			// abort in-flight request
 			lastRequestController.abort();
@@ -83,7 +113,7 @@ export function useFetch(url, options = {}) {
 
 		const opts = {
 			...ofetchOptions,
-			query: query.value,
+			query: _formatQueryParams(query.value),
 			body: body.value,
 			signal,
 		};
@@ -109,6 +139,9 @@ export function useFetch(url, options = {}) {
 		}
 
 		isSuccess.value = null;
+		if (clearData) {
+			data.value = null;
+		}
 		try {
 			const result = await ofetchInstance(unref(url), opts);
 			data.value = result;
@@ -144,7 +177,7 @@ export function useFetch(url, options = {}) {
 
 	let fetch = _fetch;
 	if (options.debouncedMs) {
-		fetch = useDebounceFn(_fetch);
+		fetch = useDebounceFn(_fetch, options.debouncedMs);
 	}
 	return {
 		data,
diff --git a/src/managers/FileManager/FileManager.vue b/src/managers/FileManager/FileManager.vue
index af56e74db..e41b73e07 100644
--- a/src/managers/FileManager/FileManager.vue
+++ b/src/managers/FileManager/FileManager.vue
@@ -12,7 +12,7 @@
 				</p>
 			</template>
 			<template #top-controls>
-				<div class="flex space-x-2">
+				<div class="flex gap-x-2">
 					<PkpButton
 						v-for="action in fileManagerStore.topActions"
 						:key="action.name"
diff --git a/src/managers/GalleyManager/GalleyManager.vue b/src/managers/GalleyManager/GalleyManager.vue
index e19c7251e..229f28a93 100644
--- a/src/managers/GalleyManager/GalleyManager.vue
+++ b/src/managers/GalleyManager/GalleyManager.vue
@@ -29,7 +29,7 @@
 			</TableRow>
 		</TableBody>
 		<template v-if="galleyManagerStore.bottomActions.length" #bottom-controls>
-			<div class="space-x-y flex">
+			<div class="flex gap-x-2">
 				<component
 					:is="Components[action.component] || action.component"
 					v-bind="action.props || {}"
diff --git a/src/managers/ReviewerManager/ReviewerManager.vue b/src/managers/ReviewerManager/ReviewerManager.vue
index cecfc1f8d..143d447e4 100644
--- a/src/managers/ReviewerManager/ReviewerManager.vue
+++ b/src/managers/ReviewerManager/ReviewerManager.vue
@@ -10,7 +10,7 @@
 				</h3>
 			</template>
 			<template #top-controls>
-				<div class="flex space-x-2">
+				<div class="flex gap-x-2">
 					<PkpButton
 						v-for="action in reviewerStore.topActions"
 						:key="action.name"
@@ -47,7 +47,7 @@
 						:redacted-for-authors="redactedForAuthors"
 					></ReviewerManagerCellStatus>
 					<TableCell>
-						<span class="flex items-center space-x-2">
+						<span class="flex items-center gap-x-2">
 							<Icon
 								v-for="icon in reviewerStore.getReviewMethodIcons(
 									reviewAssignment,
diff --git a/src/managers/ReviewerManager/reviewerManagerStore.js b/src/managers/ReviewerManager/reviewerManagerStore.js
index 1e1e90339..88704353e 100644
--- a/src/managers/ReviewerManager/reviewerManagerStore.js
+++ b/src/managers/ReviewerManager/reviewerManagerStore.js
@@ -172,6 +172,10 @@ export const useReviewerManagerStore = defineComponentStore(
 			return _actionFns.getItemPrimaryActions(args);
 		}
 
+		function reviewerSendToOrcid({reviewAssignment}) {
+			return _actionFns.reviewerSendToOrcid(getActionArgs({reviewAssignment}));
+		}
+
 		return {
 			getReviewMethodIcons,
 			reviewAssignments,
@@ -198,6 +202,7 @@ export const useReviewerManagerStore = defineComponentStore(
 			reviewerRevertConsider,
 			reviewerSendReminder,
 			reviewerLogResponse,
+			reviewerSendToOrcid,
 			_reviewerManagerActionFns: _actionFns,
 		};
 	},
diff --git a/src/managers/ReviewerManager/useReviewerManagerActions.js b/src/managers/ReviewerManager/useReviewerManagerActions.js
index 969960da1..b5dcddbd1 100644
--- a/src/managers/ReviewerManager/useReviewerManagerActions.js
+++ b/src/managers/ReviewerManager/useReviewerManagerActions.js
@@ -26,6 +26,7 @@ export const Actions = {
 	REVIEWER_REVERT_CONSIDER: 'reviewerRevertConsider',
 	REVIEWER_SEND_REMINDER: 'reviewerSendReminder',
 	REVIEWER_LOG_RESPONSE: 'reviewerLogResponse',
+	REVIEWER_SEND_TO_ORCID: 'reviewerSendToOrcid',
 };
 
 export function useReviewerManagerActions() {
@@ -198,6 +199,18 @@ export function useReviewerManagerActions() {
 			});
 		}
 
+		// ORCID reviewer deposit
+		if (
+			reviewAssignment.reviewerHasOrcid &&
+			pkp.const.REVIEW_ASSIGNMENT_STATUS_COMPLETE
+		) {
+			actions.push({
+				label: t('dashboard.reviewAssignment.action.sendReviewToOrcid'),
+				name: Actions.REVIEWER_SEND_TO_ORCID,
+				icon: 'Orcid',
+			});
+		}
+
 		return actions;
 	}
 
@@ -609,6 +622,49 @@ export function useReviewerManagerActions() {
 		);
 	}
 
+	function reviewerSendToOrcid({
+		submission,
+		reviewAssignment,
+	}) {
+		const {openDialog, openDialogNetworkError} = useModal();
+
+		let submissionId = submission.id;
+
+		openDialog({
+			actions: [
+				{
+					label: t('common.ok'),
+					isPrimary: true,
+					callback: async (close) => {
+						const {apiUrl} = useApiUrl(
+							`reviews/${submissionId}/${reviewAssignment.id}/sendToOrcid`,
+						);
+
+						const formData = new FormData();
+						formData.append('csrfToken', getCSRFToken());
+
+						const {fetch, isSuccess} = useFetch(apiUrl, {
+							method: 'POST',
+							body: formData,
+						});
+
+						await fetch();
+						close();
+						if (!isSuccess.value) {
+							openDialogNetworkError();
+						}
+					},
+				},
+				{
+					label: t('common.cancel'),
+					callback: (close) => close(),
+				},
+			],
+			title: t('dashboard.reviewAssignment.action.sendReviewToOrcid'),
+			message: t('dashboard.reviewAssignment.action.sendReviewToOrcid.confirm'),
+		});
+	}
+
 	return {
 		getTopActions,
 		getItemActions,
@@ -630,5 +686,6 @@ export function useReviewerManagerActions() {
 		reviewerRevertConsider,
 		reviewerSendReminder,
 		reviewerLogResponse,
+		reviewerSendToOrcid,
 	};
 }
diff --git a/src/managers/UserInvitationManager/UserInvitationManager.vue b/src/managers/UserInvitationManager/UserInvitationManager.vue
index bf78843a3..6f3a073f3 100755
--- a/src/managers/UserInvitationManager/UserInvitationManager.vue
+++ b/src/managers/UserInvitationManager/UserInvitationManager.vue
@@ -8,7 +8,7 @@
 			</h3>
 		</template>
 		<template #top-controls>
-			<div class="flex space-x-2">
+			<div class="flex gap-x-2">
 				<PkpButton @click="store.createNewInvitation">
 					{{ t('invitation.inviteToRole.btn') }}
 				</PkpButton>
@@ -27,7 +27,7 @@
 		<TableBody>
 			<TableRow v-for="(invitation, index) in store.invitations" :key="index">
 				<TableCell>
-					<span class="space-x-1">
+					<span class="gap-x-1">
 						<span class="align-middle text-lg-normal">
 							{{
 								invitation.userId
diff --git a/src/pages/dashboard/DashboardPage.vue b/src/pages/dashboard/DashboardPage.vue
index ed21dda79..16e531244 100644
--- a/src/pages/dashboard/DashboardPage.vue
+++ b/src/pages/dashboard/DashboardPage.vue
@@ -17,7 +17,7 @@
 
 			<div class="mt-2">
 				<div class="flex justify-between">
-					<div class="flex flex-row items-center space-x-3">
+					<div class="flex flex-row items-center gap-x-3">
 						<PkpButton @click="store.openFiltersModal">
 							{{ t('common.filter') }}
 						</PkpButton>
diff --git a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActivity/CellReviewAssignmentActivityAlert.vue b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActivity/CellReviewAssignmentActivityAlert.vue
index 114776c5b..26c900d8a 100644
--- a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActivity/CellReviewAssignmentActivityAlert.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActivity/CellReviewAssignmentActivityAlert.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex items-center space-x-2">
+	<div class="flex items-center gap-x-2">
 		<div v-if="alert">{{ alert }}</div>
 	</div>
 </template>
diff --git a/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivityActionAlert.vue b/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivityActionAlert.vue
index ed550fd73..61ea54eb7 100644
--- a/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivityActionAlert.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivityActionAlert.vue
@@ -1,12 +1,7 @@
 <template>
-	<div class="flex items-center space-x-2">
+	<div class="flex items-center gap-x-2">
 		<div v-if="alert">{{ alert }}</div>
-		<PkpButton
-			v-if="actionName"
-			class="-ms-3"
-			size-variant="compact"
-			@click="handleAction"
-		>
+		<PkpButton v-if="actionName" size-variant="compact" @click="handleAction">
 			{{ actionLabel }}
 		</PkpButton>
 	</div>
diff --git a/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivityReviews.vue b/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivityReviews.vue
index 55653a10a..62b268b27 100644
--- a/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivityReviews.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivityReviews.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-if="reviewAssignments.length">
-		<span class="space-x-1">
+		<span class="flex gap-x-1">
 			<CellSubmissionActivityReviewsItem
 				v-for="reviewAssignment in reviewAssignments"
 				:key="reviewAssignment.id"
diff --git a/src/pages/dashboard/components/DashboardTable/DashboardTable.vue b/src/pages/dashboard/components/DashboardTable/DashboardTable.vue
index 8aa8417d2..59fc684cf 100644
--- a/src/pages/dashboard/components/DashboardTable/DashboardTable.vue
+++ b/src/pages/dashboard/components/DashboardTable/DashboardTable.vue
@@ -20,7 +20,13 @@
 				{{ column.header }}
 			</TableColumn>
 		</TableHeader>
-		<TableBody>
+		<TableBody
+			:empty-text="
+				dashboardStore.isSubmissionsLoading
+					? t('common.loading')
+					: t('grid.noItems')
+			"
+		>
 			<TableRow v-for="item in items" :key="item.id">
 				<CellBulkDelete
 					v-if="dashboardStore.bulkDeleteSelectionEnabled"
diff --git a/src/pages/dashboard/components/ReviewActivityIndicatorPopover/ReviewActivityIndicatorPopover.vue b/src/pages/dashboard/components/ReviewActivityIndicatorPopover/ReviewActivityIndicatorPopover.vue
index ef98662df..c06466d2b 100644
--- a/src/pages/dashboard/components/ReviewActivityIndicatorPopover/ReviewActivityIndicatorPopover.vue
+++ b/src/pages/dashboard/components/ReviewActivityIndicatorPopover/ReviewActivityIndicatorPopover.vue
@@ -6,7 +6,7 @@
 	</div>
 	<div class="flex items-center justify-between">
 		<span class="text-lg-bold">{{ reviewerName }}</span>
-		<span class="space-x-2">
+		<span class="flex gap-x-2">
 			<Icon
 				v-for="icon in reviewMethodIcons"
 				:key="icon"
diff --git a/src/pages/dashboard/composables/useEditorialLogic.js b/src/pages/dashboard/composables/useEditorialLogic.js
index 158d8fbb2..c865b491b 100644
--- a/src/pages/dashboard/composables/useEditorialLogic.js
+++ b/src/pages/dashboard/composables/useEditorialLogic.js
@@ -2,9 +2,8 @@ import {useSubmission} from '@/composables/useSubmission.js';
 import {useLocalize} from '@/composables/useLocalize';
 import {useDate} from '@/composables/useDate';
 import {Actions as ParticipantManagerActions} from '@/managers/ParticipantManager/useParticipantManagerActions';
-import {Actions as WorkflowActions} from '@/pages/workflow/composables/useWorkflowActions';
 import {Actions as ReviewerManagerActions} from '@/managers/ReviewerManager/useReviewerManagerActions';
-
+import {Actions as FileManagerActions} from '@/managers/FileManager/useFileManagerActions';
 const {formatShortDate} = useDate();
 
 const {t} = useLocalize();
@@ -212,7 +211,10 @@ export function useEditorialLogic() {
 	function getEditorialActivityForMySubmissions(submission) {
 		const activeStage = getActiveStage(submission);
 
-		if (activeStage.id === pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW) {
+		if (
+			activeStage.id === pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW ||
+			activeStage.id === pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW
+		) {
 			const activeRound = getCurrentReviewRound(submission);
 
 			if (
@@ -220,13 +222,23 @@ export function useEditorialLogic() {
 					activeRound.statusId,
 				)
 			) {
+				const fileStage =
+					activeStage.id === pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW
+						? pkp.const.SUBMISSION_FILE_INTERNAL_REVIEW_REVISION
+						: pkp.const.SUBMISSION_FILE_REVIEW_REVISION;
 				return [
 					{
 						component: 'CellSubmissionActivityActionAlert',
 						props: {
 							alert: t('dashboard.revisionRequested'),
 							actionLabel: t('dashboard.submitRevisions'),
-							actionName: WorkflowActions.UPLOAD_REVISIONS,
+							actionName: FileManagerActions.FILE_UPLOAD,
+							actionArgs: {
+								submissionId: submission.id,
+								fileStage,
+								reviewRoundId: activeRound.id,
+								wizardTitleKey: t('editor.submissionReview.uploadFile'),
+							},
 						},
 					},
 				];
diff --git a/src/pages/dashboard/dashboardPageStore.js b/src/pages/dashboard/dashboardPageStore.js
index 8a1ef887c..852266574 100644
--- a/src/pages/dashboard/dashboardPageStore.js
+++ b/src/pages/dashboard/dashboardPageStore.js
@@ -14,6 +14,7 @@ import {useWorkflowActions} from '../workflow/composables/useWorkflowActions';
 import {useReviewerManagerActions} from '@/managers/ReviewerManager/useReviewerManagerActions';
 import {useDashboardBulkDelete} from './composables/useDashboardBulkDelete';
 import {useParticipantManagerActions} from '@/managers/ParticipantManager/useParticipantManagerActions';
+import {useFileManagerActions} from '@/managers/FileManager/useFileManagerActions';
 
 import {useEditorialLogic} from './composables/useEditorialLogic';
 import {useReviewActivityLogic} from './composables/useReviewActivityLogic';
@@ -220,7 +221,7 @@ export const useDashboardPageStore = defineComponentStore(
 
 				announce(t('common.loading'));
 
-				await fetchSubmissions();
+				await fetchSubmissions({clearData: true});
 				announce(t('common.loaded'));
 			},
 			{immediate: true},
@@ -230,7 +231,7 @@ export const useDashboardPageStore = defineComponentStore(
 		const _reviewerManagerActionFns = useReviewerManagerActions(pageInitConfig);
 		const _participantManagerActionsFns =
 			useParticipantManagerActions(pageInitConfig);
-
+		const _fileManagerActionFns = useFileManagerActions();
 		const {getCurrentPublication} = useSubmission();
 
 		function refetchCallback() {
@@ -336,6 +337,13 @@ export const useDashboardPageStore = defineComponentStore(
 			);
 		}
 
+		/**
+		 * File Manager actions
+		 */
+		function fileUpload(args) {
+			_fileManagerActionFns.fileUpload(enrichActionArgs(args), refetchCallback);
+		}
+
 		/**
 		 * Participants Actions
 		 *
@@ -459,6 +467,9 @@ export const useDashboardPageStore = defineComponentStore(
 			// Reviewer listing
 			openReviewerForm,
 
+			// File manager actions
+			fileUpload,
+
 			// Reviewer manager actions
 			reviewerAddReviewer,
 			reviewerReviewDetails,
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOJS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOJS.js
index a262b1c70..584e3e9b2 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOJS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOJS.js
@@ -1,5 +1,6 @@
 import {useLocalize} from '@/composables/useLocalize';
-import {Actions} from '../useWorkflowActions';
+import {Actions as WorkflowActions} from '../useWorkflowActions';
+import {Actions as FileManagerActions} from '@/managers/FileManager/useFileManagerActions';
 import {useSubmission} from '@/composables/useSubmission';
 
 const {
@@ -25,7 +26,7 @@ export function getHeaderItems({
 		component: 'WorkflowActionButton',
 		props: {
 			label: t('editor.submissionLibrary'),
-			action: Actions.WORKFLOW_VIEW_LIBRARY,
+			action: WorkflowActions.WORKFLOW_VIEW_LIBRARY,
 		},
 	});
 
@@ -159,9 +160,37 @@ export const WorkflowConfig = {
 
 			return items;
 		},
+		getActionItems: ({submission, selectedReviewRound}) => {
+			const actions = [];
+
+			if (
+				[
+					pkp.const.REVIEW_ROUND_STATUS_REVISIONS_REQUESTED,
+					pkp.const.REVIEW_ROUND_STATUS_RESUBMIT_FOR_REVIEW,
+					pkp.const.REVIEW_ROUND_STATUS_REVISIONS_SUBMITTED,
+					pkp.const.REVIEW_ROUND_STATUS_REVISIONS_SUBMITTED,
+				].includes(selectedReviewRound.statusId)
+			)
+				actions.push({
+					component: 'WorkflowActionButton',
+					props: {
+						action: FileManagerActions.FILE_UPLOAD,
+						label: t('workflow.uploadRevisions'),
+						actionArgs: {
+							submissionId: submission.id,
+							fileStage: pkp.const.SUBMISSION_FILE_REVIEW_REVISION,
+							reviewRoundId: selectedReviewRound.id,
+							wizardTitleKey: 'editor.submissionReview.uploadFile',
+							submissionStageId: pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW,
+						},
+					},
+				});
+			return actions;
+		},
 	},
+
 	[pkp.const.WORKFLOW_STAGE_ID_EDITING]: {
-		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
+		getPrimaryItems: ({submission, selectedStageId}) => {
 			const items = [];
 
 			items.push({
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOMP.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOMP.js
index 739c83312..5bf6d84ea 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOMP.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOMP.js
@@ -1,6 +1,7 @@
 import {useLocalize} from '@/composables/useLocalize';
 import {Actions} from '../useWorkflowActions';
 import {useSubmission} from '@/composables/useSubmission';
+import {Actions as FileManagerActions} from '@/managers/FileManager/useFileManagerActions';
 
 const {hasSubmissionPassedStage, getOpenReviewAssignmentsForRound} =
 	useSubmission();
@@ -98,6 +99,34 @@ export const WorkflowConfig = {
 
 			return items;
 		},
+		getActionItems: ({submission, selectedReviewRound}) => {
+			const actions = [];
+			const {t} = useLocalize();
+
+			if (
+				[
+					pkp.const.REVIEW_ROUND_STATUS_REVISIONS_REQUESTED,
+					pkp.const.REVIEW_ROUND_STATUS_RESUBMIT_FOR_REVIEW,
+					pkp.const.REVIEW_ROUND_STATUS_REVISIONS_SUBMITTED,
+					pkp.const.REVIEW_ROUND_STATUS_REVISIONS_SUBMITTED,
+				].includes(selectedReviewRound.statusId)
+			)
+				actions.push({
+					component: 'WorkflowActionButton',
+					props: {
+						action: FileManagerActions.FILE_UPLOAD,
+						label: t('workflow.uploadRevisions'),
+						actionArgs: {
+							submissionId: submission.id,
+							fileStage: pkp.const.SUBMISSION_FILE_INTERNAL_REVIEW_REVISION,
+							reviewRoundId: selectedReviewRound.id,
+							wizardTitleKey: 'editor.submissionReview.uploadFile',
+							submissionStageId: pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW,
+						},
+					},
+				});
+			return actions;
+		},
 	},
 	[pkp.const.WORKFLOW_STAGE_ID_EDITING]: {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
index 71a6cea9c..23f3b63ad 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
@@ -1,5 +1,4 @@
 import {useLocalize} from '@/composables/useLocalize';
-import {Actions} from '../useWorkflowActions';
 import {useSubmission} from '@/composables/useSubmission';
 import {useCurrentUser} from '@/composables/useCurrentUser';
 
@@ -42,7 +41,21 @@ export function getHeaderItems({
 			component: 'WorkflowActionButton',
 			props: {
 				label: t('common.view'),
-				action: Actions.WORKFLOW_VIEW_PUBLISHED_SUBMISSION,
+				action: WorkflowActions.WORKFLOW_VIEW_PUBLISHED_SUBMISSION,
+			},
+		});
+	}
+
+	if (
+		submission.status !== pkp.const.STATUS_PUBLISHED &&
+		(submission.stageId === pkp.const.WORKFLOW_STAGE_ID_EDITING ||
+			submission.stageId === pkp.const.WORKFLOW_STAGE_ID_PRODUCTION)
+	) {
+		actions.push({
+			component: 'WorkflowActionButton',
+			props: {
+				label: t('common.preview'),
+				action: WorkflowActions.WORKFLOW_VIEW_PUBLISHED_SUBMISSION,
 			},
 		});
 	}
@@ -52,7 +65,7 @@ export function getHeaderItems({
 			component: 'WorkflowActionButton',
 			props: {
 				label: t('editor.activityLog'),
-				action: Actions.WORKFLOW_VIEW_ACTIVITY_LOG,
+				action: WorkflowActions.WORKFLOW_VIEW_ACTIVITY_LOG,
 			},
 		});
 	}
@@ -60,7 +73,7 @@ export function getHeaderItems({
 		component: 'WorkflowActionButton',
 		props: {
 			label: t('editor.submissionLibrary'),
-			action: Actions.WORKFLOW_VIEW_LIBRARY,
+			action: WorkflowActions.WORKFLOW_VIEW_LIBRARY,
 		},
 	});
 
@@ -696,7 +709,7 @@ export const PublicationConfig = {
 						props: {
 							label: t('common.preview'),
 							isSecondary: true,
-							action: Actions.WORKFLOW_PREVIEW_PUBLICATION,
+							action: WorkflowActions.WORKFLOW_PREVIEW_PUBLICATION,
 						},
 					});
 				}
@@ -712,7 +725,7 @@ export const PublicationConfig = {
 								: t('editor.submission.schedulePublication'),
 						isSecondary: true,
 						action:
-							Actions.WORKFLOW_ASSIGN_TO_ISSUE_AND_SCHEDULE_FOR_PUBLICATION,
+							WorkflowActions.WORKFLOW_ASSIGN_TO_ISSUE_AND_SCHEDULE_FOR_PUBLICATION,
 					},
 				});
 			} else if (selectedPublication.status === pkp.const.STATUS_SCHEDULED) {
@@ -721,7 +734,7 @@ export const PublicationConfig = {
 					props: {
 						label: t('common.preview'),
 						isSecondary: true,
-						action: Actions.WORKFLOW_PREVIEW_PUBLICATION,
+						action: WorkflowActions.WORKFLOW_PREVIEW_PUBLICATION,
 					},
 				});
 
@@ -730,7 +743,7 @@ export const PublicationConfig = {
 					props: {
 						label: t('publication.unschedule'),
 						isWarnable: true,
-						action: Actions.WORKFLOW_UNSCHEDULE_PUBLICATION,
+						action: WorkflowActions.WORKFLOW_UNSCHEDULE_PUBLICATION,
 					},
 				});
 			} else if (selectedPublication.status === pkp.const.STATUS_PUBLISHED) {
@@ -739,7 +752,7 @@ export const PublicationConfig = {
 					props: {
 						label: t('publication.unpublish'),
 						isWarnable: true,
-						action: Actions.WORKFLOW_UNPUBLISH_PUBLICATION,
+						action: WorkflowActions.WORKFLOW_UNPUBLISH_PUBLICATION,
 					},
 				});
 
@@ -752,7 +765,7 @@ export const PublicationConfig = {
 						props: {
 							label: t('publication.createVersion'),
 							isSecondary: true,
-							action: Actions.WORKFLOW_CREATE_NEW_VERSION,
+							action: WorkflowActions.WORKFLOW_CREATE_NEW_VERSION,
 						},
 					});
 				}
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
index 9f7329cb8..a9d160b6e 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
@@ -21,17 +21,10 @@ export function getHeaderItems({
 		return [];
 	}
 	const {t} = useLocalize();
-	const items = [];
-
-	items.push({
-		component: 'WorkflowWorkTypeOMP',
-		props: {
-			submission: submission,
-		},
-	});
+	const actions = [];
 
 	if (submission.status === pkp.const.STATUS_PUBLISHED) {
-		items.push({
+		actions.push({
 			component: 'WorkflowActionButton',
 			props: {
 				label: t('common.view'),
@@ -40,8 +33,22 @@ export function getHeaderItems({
 		});
 	}
 
+	if (
+		submission.status !== pkp.const.STATUS_PUBLISHED &&
+		(submission.stageId === pkp.const.WORKFLOW_STAGE_ID_EDITING ||
+			submission.stageId === pkp.const.WORKFLOW_STAGE_ID_PRODUCTION)
+	) {
+		actions.push({
+			component: 'WorkflowActionButton',
+			props: {
+				label: t('common.preview'),
+				action: WorkflowActions.WORKFLOW_VIEW_PUBLISHED_SUBMISSION,
+			},
+		});
+	}
+
 	if (permissions.canAccessEditorialHistory) {
-		items.push({
+		actions.push({
 			component: 'WorkflowActionButton',
 			props: {
 				label: t('editor.activityLog'),
@@ -49,7 +56,7 @@ export function getHeaderItems({
 			},
 		});
 	}
-	items.push({
+	actions.push({
 		component: 'WorkflowActionButton',
 		props: {
 			label: t('editor.submissionLibrary'),
@@ -57,7 +64,14 @@ export function getHeaderItems({
 		},
 	});
 
-	return items;
+	actions.push({
+		component: 'WorkflowWorkTypeOMP',
+		props: {
+			submission: submission,
+		},
+	});
+
+	return actions;
 }
 
 export const WorkflowConfig = {
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js
index a3d560df3..9243db567 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js
@@ -34,6 +34,20 @@ export function getHeaderItems({
 		});
 	}
 
+	if (
+		submission.status !== pkp.const.STATUS_PUBLISHED &&
+		(submission.stageId === pkp.const.WORKFLOW_STAGE_ID_EDITING ||
+			submission.stageId === pkp.const.WORKFLOW_STAGE_ID_PRODUCTION)
+	) {
+		actions.push({
+			component: 'WorkflowActionButton',
+			props: {
+				label: t('common.preview'),
+				action: WorkflowActions.WORKFLOW_VIEW_PUBLISHED_SUBMISSION,
+			},
+		});
+	}
+
 	if (permissions.canAccessEditorialHistory) {
 		actions.push({
 			component: 'WorkflowActionButton',
diff --git a/src/pages/workflow/workflowStore.js b/src/pages/workflow/workflowStore.js
index 6388fb692..f488effa2 100644
--- a/src/pages/workflow/workflowStore.js
+++ b/src/pages/workflow/workflowStore.js
@@ -11,6 +11,8 @@ import {
 	Actions as DecisionActions,
 } from './composables/useWorkflowDecisions';
 
+import {useFileManagerActions} from '@/managers/FileManager/useFileManagerActions';
+
 import {useDataChangedProvider} from '@/composables/useDataChangedProvider';
 
 import {wrapActionFns} from '@/utils/wrapActionFns';
@@ -149,6 +151,26 @@ export const useWorkflowStore = defineComponentStore(
 				}),
 		);
 
+		/**
+		 * File Manager actions
+		 */
+		/**
+		 * File Manager actions
+		 */
+		const _fileManagerActionFns = useFileManagerActions();
+
+		function fileUpload(args) {
+			_fileManagerActionFns.fileUpload(
+				{
+					submission: submission.value,
+					selectedPublication: selectedPublication.value,
+					reviewRoundId: selectedReviewRound.value?.id,
+					...args,
+				},
+				() => triggerDataChange(),
+			);
+		}
+
 		/**
 		 * Items
 		 *
@@ -199,6 +221,11 @@ export const useWorkflowStore = defineComponentStore(
 			...workflowActions,
 			...decisionActions,
 
+			/**
+			 * File manager actions
+			 */
+			fileUpload,
+
 			/**
 			 * Summary
 			 */