diff --git a/apps/ocp-plugin/src/components/AppContext/AppContext.tsx b/apps/ocp-plugin/src/components/AppContext/AppContext.tsx
index 246d0242d..67c1824e2 100644
--- a/apps/ocp-plugin/src/components/AppContext/AppContext.tsx
+++ b/apps/ocp-plugin/src/components/AppContext/AppContext.tsx
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import {
   AppContext,
   AppContextProps,
@@ -5,6 +6,7 @@ import {
   NavLinkFC,
   PromptFC,
 } from '@flightctl/ui-components/src/hooks/useAppContext';
+import { SystemRestoreProvider } from '@flightctl/ui-components/src/hooks/useSystemRestoreContext';
 import { ROUTE } from '@flightctl/ui-components/src/hooks/useNavigate';
 import {
   Link,
@@ -24,7 +26,20 @@ import { useFetch } from '../../hooks/useFetch';
 
 import './AppContext.css';
 
-export const OCPPluginAppContext = AppContext.Provider;
+/**
+ * OCP Plugin App Context Provider that includes SystemRestoreProvider
+ * The OCP plugin system calls useValuesAppContext separately and passes the value as a prop
+ */
+export const OCPPluginAppContext: React.FC<React.PropsWithChildren<{ value: AppContextProps }>> = ({
+  children,
+  value,
+}) => {
+  return (
+    <AppContext.Provider value={value}>
+      <SystemRestoreProvider>{children}</SystemRestoreProvider>
+    </AppContext.Provider>
+  );
+};
 
 const appRoutes = {
   [ROUTE.ROOT]: '/',
diff --git a/apps/ocp-plugin/src/hooks/useFetch.ts b/apps/ocp-plugin/src/hooks/useFetch.ts
index 37a8a4a1e..0be0b05f1 100644
--- a/apps/ocp-plugin/src/hooks/useFetch.ts
+++ b/apps/ocp-plugin/src/hooks/useFetch.ts
@@ -42,9 +42,16 @@ export const useFetch = () => {
     [],
   );
 
-  const post = React.useCallback(async <R>(kind: string, obj: R): Promise<R> => postData(kind, obj), []);
+  const post = React.useCallback(
+    async <TRequest, TResponse = TRequest>(kind: string, data: TRequest): Promise<TResponse> => {
+      return postData<TRequest, TResponse>(kind, data);
+    },
+    [],
+  );
 
-  const put = React.useCallback(async <R>(kind: string, obj: R): Promise<R> => putData(kind, obj), []);
+  const put = React.useCallback(async <TRequest>(kind: string, data: TRequest): Promise<TRequest> => {
+    return putData<TRequest>(kind, data);
+  }, []);
 
   const remove = React.useCallback(
     async <R>(kind: string, abortSignal?: AbortSignal): Promise<R> => deleteData(kind, abortSignal),
@@ -52,8 +59,8 @@ export const useFetch = () => {
   );
 
   const patch = React.useCallback(
-    async <R>(kind: string, obj: PatchRequest, abortSignal?: AbortSignal): Promise<R> =>
-      patchData(kind, obj, abortSignal),
+    async <R>(kind: string, patches: PatchRequest, abortSignal?: AbortSignal): Promise<R> =>
+      patchData(kind, patches, abortSignal),
     [],
   );
 
diff --git a/apps/ocp-plugin/src/utils/apiCalls.ts b/apps/ocp-plugin/src/utils/apiCalls.ts
index 6cab73e76..165c0032e 100644
--- a/apps/ocp-plugin/src/utils/apiCalls.ts
+++ b/apps/ocp-plugin/src/utils/apiCalls.ts
@@ -72,7 +72,11 @@ export const handleApiJSONResponse = async <R>(response: Response): Promise<R> =
   throw new Error(await getErrorMsgFromApiResponse(response));
 };
 
-const putOrPostData = async <R>(kind: string, data: R, method: 'PUT' | 'POST'): Promise<R> => {
+const putOrPostData = async <TRequest, TResponse = TRequest>(
+  kind: string,
+  data: TRequest,
+  method: 'PUT' | 'POST',
+): Promise<TResponse> => {
   const options: RequestInit = {
     headers: {
       'Content-Type': 'application/json',
@@ -90,9 +94,11 @@ const putOrPostData = async <R>(kind: string, data: R, method: 'PUT' | 'POST'):
   }
 };
 
-export const postData = async <R>(kind: string, data: R): Promise<R> => putOrPostData(kind, data, 'POST');
+export const postData = async <TRequest, TResponse = TRequest>(kind: string, data: TRequest): Promise<TResponse> =>
+  putOrPostData<TRequest, TResponse>(kind, data, 'POST');
 
-export const putData = async <R>(kind: string, data: R): Promise<R> => putOrPostData(kind, data, 'PUT');
+export const putData = async <TRequest>(kind: string, data: TRequest): Promise<TRequest> =>
+  putOrPostData<TRequest, TRequest>(kind, data, 'PUT');
 
 export const deleteData = async <R>(kind: string, abortSignal?: AbortSignal): Promise<R> => {
   const options: RequestInit = {
diff --git a/apps/standalone/src/app/hooks/useFetch.ts b/apps/standalone/src/app/hooks/useFetch.ts
index 2176618a9..2a15c380a 100644
--- a/apps/standalone/src/app/hooks/useFetch.ts
+++ b/apps/standalone/src/app/hooks/useFetch.ts
@@ -8,9 +8,16 @@ export const useFetch = () => {
     [],
   );
 
-  const post = React.useCallback(async <R>(kind: string, obj: R): Promise<R> => postData(kind, obj), []);
+  const post = React.useCallback(
+    async <TRequest, TResponse = TRequest>(kind: string, data: TRequest): Promise<TResponse> =>
+      postData<TRequest, TResponse>(kind, data),
+    [],
+  );
 
-  const put = React.useCallback(async <R>(kind: string, obj: R): Promise<R> => putData(kind, obj), []);
+  const put = React.useCallback(
+    async <TRequest>(kind: string, data: TRequest): Promise<TRequest> => putData<TRequest>(kind, data),
+    [],
+  );
 
   const remove = React.useCallback(
     async <R>(kind: string, abortSignal?: AbortSignal): Promise<R> => deleteData(kind, abortSignal),
diff --git a/apps/standalone/src/app/index.tsx b/apps/standalone/src/app/index.tsx
index 3712d4493..fcda78f8f 100644
--- a/apps/standalone/src/app/index.tsx
+++ b/apps/standalone/src/app/index.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { AppContext } from '@flightctl/ui-components/src/hooks/useAppContext';
+import { SystemRestoreProvider } from '@flightctl/ui-components/src/hooks/useSystemRestoreContext';
 
 import { AppRouter } from './routes';
 import { useStandaloneAppContext } from './hooks/useStandaloneAppContext';
@@ -19,7 +20,9 @@ const App: React.FunctionComponent = () => {
     <React.Suspense fallback={<div />}>
       <AuthContext.Provider value={authContextValue}>
         <AppContext.Provider value={appContextValue}>
-          <AppRouter />
+          <SystemRestoreProvider>
+            <AppRouter />
+          </SystemRestoreProvider>
         </AppContext.Provider>
       </AuthContext.Provider>
     </React.Suspense>
diff --git a/apps/standalone/src/app/utils/apiCalls.ts b/apps/standalone/src/app/utils/apiCalls.ts
index d40358e69..f08f92c62 100644
--- a/apps/standalone/src/app/utils/apiCalls.ts
+++ b/apps/standalone/src/app/utils/apiCalls.ts
@@ -105,9 +105,13 @@ export const fetchCliArtifacts = async (abortSignal?: AbortSignal): Promise<CliA
   }
 };
 
-const putOrPostData = async <R>(kind: string, data: R, method: 'PUT' | 'POST'): Promise<R> => {
+const putOrPostData = async <TRequest, TResponse = TRequest>(
+  kind: string,
+  data: TRequest,
+  method: 'PUT' | 'POST',
+): Promise<TResponse> => {
   try {
-    return await fetchWithRetry<R>(kind, {
+    return await fetchWithRetry<TResponse>(kind, {
       headers: {
         'Content-Type': 'application/json',
       },
@@ -121,9 +125,11 @@ const putOrPostData = async <R>(kind: string, data: R, method: 'PUT' | 'POST'):
   }
 };
 
-export const postData = async <R>(kind: string, data: R): Promise<R> => putOrPostData(kind, data, 'POST');
+export const postData = async <TRequest, TResponse = TRequest>(kind: string, data: TRequest): Promise<TResponse> =>
+  putOrPostData<TRequest, TResponse>(kind, data, 'POST');
 
-export const putData = async <R>(kind: string, data: R): Promise<R> => putOrPostData(kind, data, 'PUT');
+export const putData = async <TRequest>(kind: string, data: TRequest): Promise<TRequest> =>
+  putOrPostData<TRequest, TRequest>(kind, data, 'PUT');
 
 export const deleteData = async <R>(kind: string, abortSignal?: AbortSignal): Promise<R> => {
   try {
diff --git a/libs/ansible/src/hooks/useFetch.ts b/libs/ansible/src/hooks/useFetch.ts
index e1a11b4f6..338bdf885 100644
--- a/libs/ansible/src/hooks/useFetch.ts
+++ b/libs/ansible/src/hooks/useFetch.ts
@@ -24,12 +24,13 @@ export const useFetch = (getCookie: (name: string) => string | undefined, servic
   );
 
   const post = React.useCallback(
-    async <R>(kind: string, obj: R): Promise<R> => postData(kind, obj, serviceUrl, applyHeaders),
+    async <TRequest, TResponse = TRequest>(kind: string, data: TRequest): Promise<TResponse> =>
+      postData(kind, data, serviceUrl, applyHeaders),
     [serviceUrl, applyHeaders],
   );
 
   const put = React.useCallback(
-    async <R>(kind: string, obj: R): Promise<R> => putData(kind, obj, serviceUrl, applyHeaders),
+    async <TRequest>(kind: string, data: TRequest): Promise<TRequest> => putData(kind, data, serviceUrl, applyHeaders),
     [serviceUrl, applyHeaders],
   );
 
diff --git a/libs/ansible/src/utils/apiCalls.ts b/libs/ansible/src/utils/apiCalls.ts
index 3fb33a63f..1d82e7903 100644
--- a/libs/ansible/src/utils/apiCalls.ts
+++ b/libs/ansible/src/utils/apiCalls.ts
@@ -17,13 +17,13 @@ const handleApiJSONResponse = async <R>(response: Response): Promise<R> => {
   throw new Error(await getErrorMsgFromApiResponse(response));
 };
 
-const putOrPostData = async <R>(
+const putOrPostData = async <TRequest, TResponse = TRequest>(
   kind: string,
-  data: R,
+  data: TRequest,
   serviceUrl: string,
   applyOptions: (options: RequestInit) => RequestInit,
   method: 'PUT' | 'POST',
-): Promise<R> => {
+): Promise<TResponse> => {
   const options: RequestInit = {
     headers: {
       'Content-Type': 'application/json',
@@ -41,19 +41,19 @@ const putOrPostData = async <R>(
   }
 };
 
-export const postData = async <R>(
+export const postData = async <TRequest, TResponse = TRequest>(
   kind: string,
-  data: R,
+  data: TRequest,
   serviceUrl: string,
   applyOptions: (options: RequestInit) => RequestInit,
-) => putOrPostData(kind, data, serviceUrl, applyOptions, 'POST');
+): Promise<TResponse> => putOrPostData<TRequest, TResponse>(kind, data, serviceUrl, applyOptions, 'POST');
 
-export const putData = async <R>(
+export const putData = async <TRequest>(
   kind: string,
-  data: R,
+  data: TRequest,
   serviceUrl: string,
   applyOptions: (options: RequestInit) => RequestInit,
-) => putOrPostData(kind, data, serviceUrl, applyOptions, 'PUT');
+): Promise<TRequest> => putOrPostData<TRequest, TRequest>(kind, data, serviceUrl, applyOptions, 'PUT');
 
 export const deleteData = async <R>(
   kind: string,
diff --git a/libs/i18n/locales/en/translation.json b/libs/i18n/locales/en/translation.json
index 9198a8435..3dded55cf 100644
--- a/libs/i18n/locales/en/translation.json
+++ b/libs/i18n/locales/en/translation.json
@@ -90,6 +90,8 @@
   "Failed to retrieve resource details": "Failed to retrieve resource details",
   "Delete {{ resourceType }}": "Delete {{ resourceType }}",
   "Decommission device": "Decommission device",
+  "Resume device": "Resume device",
+  "You are about to resume device <1>{deviceNameOrAlias}</1>": "You are about to resume device <1>{deviceNameOrAlias}</1>",
   "Actions dropdown": "Actions dropdown",
   "Actions": "Actions",
   "Device applications table": "Device applications table",
@@ -122,6 +124,7 @@
   "Applications": "Applications",
   "Track systemd services": "Track systemd services",
   "Delete forever": "Delete forever",
+  "You are about to resume <1>{deviceNameOrAlias}</1>": "You are about to resume <1>{deviceNameOrAlias}</1>",
   "Details": "Details",
   "YAML": "YAML",
   "Terminal": "Terminal",
@@ -355,9 +358,11 @@
   "Device specification has returned to a valid state": "Device specification has returned to a valid state",
   "Device specification is invalid": "Device specification is invalid",
   "Device is paused after database restore": "Device is paused after database restore",
+  "Device conflict has been resolved": "Device conflict has been resolved",
   "Enrollment request was approved": "Enrollment request was approved",
   "Enrollment request approval failed": "Enrollment request approval failed",
   "Internal task failed": "Internal task failed",
+  "Internal task permanently failed": "Internal task permanently failed",
   "Repository is accessible": "Repository is accessible",
   "Repository is inaccessible": "Repository is inaccessible",
   "Referenced repository was updated": "Referenced repository was updated",
@@ -460,6 +465,9 @@
   "Fleet devices popover": "Fleet devices popover",
   "Rollout error": "Rollout error",
   "Managed by the resource sync {{resourceSyncName}}": "Managed by the resource sync {{resourceSyncName}}",
+  "Resume all": "Resume all",
+  "You are about to resume all<1>{suspendedDevicesCount}</1> suspended devices in <4>{fleetId}</4>_one": "You are about to resume <1>{suspendedDevicesCount}</1> suspended device in <4>{fleetId}</4>",
+  "You are about to resume all<1>{suspendedDevicesCount}</1> suspended devices in <4>{fleetId}</4>_other": "You are about to resume all<1>{suspendedDevicesCount}</1> suspended devices in <4>{fleetId}</4>",
   "Importing fleets from <1>{name}</1>. This might take a few minutes to complete.": "Importing fleets from <1>{name}</1>. This might take a few minutes to complete.",
   "Fleets import failed": "Fleets import failed",
   "Importing fleets from <1>{name}</1> failed. Check the resource sync for more details.": "Importing fleets from <1>{name}</1> failed. Check the resource sync for more details.",
@@ -558,9 +566,12 @@
   "Invalid systemd service names: {{invalidPatterns}}": "Invalid systemd service names: {{invalidPatterns}}",
   "Systemd service names must be unique": "Systemd service names must be unique",
   "Device aliases must be unique. Add a number to the template to generate unique aliases.": "Device aliases must be unique. Add a number to the template to generate unique aliases.",
+  "Fleet selection is required": "Fleet selection is required",
+  "At least one label is required": "At least one label is required",
   "device": "device",
   "pending device": "pending device",
   "resource sync": "resource sync",
+  "You are about to resume device <1>{deviceName}</1>": "You are about to resume device <1>{deviceName}</1>",
   "No {{ productName }} command line tools were found for this deployment at this time.": "No {{ productName }} command line tools were found for this deployment at this time.",
   "Could not list the {{ productName }} command line tools": "Could not list the {{ productName }} command line tools",
   "Download flightctl CLI for {{ os }} for {{ arch }}": "Download flightctl CLI for {{ os }} for {{ arch }}",
@@ -616,6 +627,47 @@
   "Delete resource syncs": "Delete resource syncs",
   "Are you sure you want to delete the following resource syncs?": "Are you sure you want to delete the following resource syncs?",
   "Revision": "Revision",
+  "Failed to obtain the number of matching devices": "Failed to obtain the number of matching devices",
+  "Resume devices": "Resume devices",
+  "Resume selection": "Resume selection",
+  "Following a system restore, devices have been identified with configurations newer than the server's records. To prevent data loss, they have been suspended from receiving updates.": "Following a system restore, devices have been identified with configurations newer than the server's records. To prevent data loss, they have been suspended from receiving updates.",
+  "Choose the criteria to select the devices to resume": "Choose the criteria to select the devices to resume",
+  "Resume all suspended devices associated with a given fleet": "Resume all suspended devices associated with a given fleet",
+  "Resume all suspended devices matching the specified labels": "Resume all suspended devices matching the specified labels",
+  "All suspended devices": "All suspended devices",
+  "Resume all suspended devices": "Resume all suspended devices",
+  "Select a fleet": "Select a fleet",
+  "Device selector labels": "Device selector labels",
+  "This fleet does not select any devices": "This fleet does not select any devices",
+  "Refreshing device count": "Refreshing device count",
+  "Checking how many suspended devices match your criteria...": "Checking how many suspended devices match your criteria...",
+  "Unable to refresh device count": "Unable to refresh device count",
+  "Devices found": "Devices found",
+  "<0>{deviceCount}</0> suspended devices are currently associated with fleet <3>{values.fleetId}</3>.": "<0>{deviceCount}</0> suspended devices are currently associated with fleet <3>{values.fleetId}</3>.",
+  "<0>{deviceCount}</0> suspended devices match the specified labels.": "<0>{deviceCount}</0> suspended devices match the specified labels.",
+  "You are about to resume all <1>{deviceCount}</1> suspended devices._one": "You are about to resume <1>{deviceCount}</1> suspended device.",
+  "You are about to resume all <1>{deviceCount}</1> suspended devices._other": "You are about to resume all <1>{deviceCount}</1> suspended devices.",
+  "This action is irreversible and will allow all affected devices to receive new configuration updates from the server.": "This action is irreversible and will allow all affected devices to receive new configuration updates from the server.",
+  "No devices found": "No devices found",
+  "No suspended devices are associated with fleet <1>{values.fleetId}</1>.": "No suspended devices are associated with fleet <1>{values.fleetId}</1>.",
+  "No suspended devices found.": "No suspended devices found.",
+  "No suspended devices match the specified labels.": "No suspended devices match the specified labels.",
+  "Resume devices failed": "Resume devices failed",
+  "Resume successful": "Resume successful",
+  "{{ resumedCount }} devices were resumed": "{{ resumedCount }} devices were resumed",
+  "Resumed with warnings": "Resumed with warnings",
+  "{{ expectedCount }} devices to resume, and {{ resumedCount }} resumed successfully": "{{ expectedCount }} devices to resume, and {{ resumedCount }} resumed successfully",
+  "Resume all {{ deviceCount }} devices?": "Resume all {{ deviceCount }} devices?",
+  "Resume all devices": "Resume all devices",
+  "Resume devices?_one": "Resume devices?",
+  "Resume devices?_other": "Resume devices?",
+  "Resume": "Resume",
+  "This action will resolve the configuration conflict and allow the devices to receive new updates from the server. This action is irreversible, please ensure the devices' assigned configuration is correct before proceeding._one": "This action will resolve the configuration conflict and allow the device to receive new updates from the server. This action is irreversible, please ensure the device's assigned configuration is correct before proceeding.",
+  "This action will resolve the configuration conflict and allow the devices to receive new updates from the server. This action is irreversible, please ensure the devices' assigned configuration is correct before proceeding._other": "This action will resolve the configuration conflict and allow the devices to receive new updates from the server. This action is irreversible, please ensure the devices' assigned configuration is correct before proceeding.",
+  "Resuming devices failed_one": "Resuming device failed",
+  "Resuming devices failed_other": "Resuming devices failed",
+  "All {{ resumedCount }} devices resumed successfully": "All {{ resumedCount }} devices resumed successfully",
+  "Resume with warnings": "Resume with warnings",
   "Some application workloads are degraded": "Some application workloads are degraded",
   "Resource was deleted successfully": "Resource was deleted successfully",
   "Enrollment request": "Enrollment request",
@@ -730,6 +782,18 @@
   "Overall status of application workloads.": "Overall status of application workloads.",
   "Overall status of device hardware and operating system.": "Overall status of device hardware and operating system.",
   "Current system configuration vs. latest system configuration.": "Current system configuration vs. latest system configuration.",
+  "{{brand}} is waiting for the device to connect and report its status. It will report a ʼPending syncʼ status until it is able to reconnect. If it has configuration conflicts, it will report a ʼSuspendedʼ status and require manual action to resume.": "{{brand}} is waiting for the device to connect and report its status. It will report a ʼPending syncʼ status until it is able to reconnect. If it has configuration conflicts, it will report a ʼSuspendedʼ status and require manual action to resume.",
+  "{{brand}} is waiting for devices to connect and report their status. Devices will report a ʼPending syncʼ status until they are able to connect. Devices with configuration conflicts will report a ʼSuspendedʼ status and require manual action to resume.": "{{brand}} is waiting for devices to connect and report their status. Devices will report a ʼPending syncʼ status until they are able to connect. Devices with configuration conflicts will report a ʼSuspendedʼ status and require manual action to resume.",
+  "System recovery complete": "System recovery complete",
+  "This device is suspended because its local configuration is newer than the server's record. It will not receive updates until it is resumed.": "This device is suspended because its local configuration is newer than the server's record. It will not receive updates until it is resumed.",
+  "<0>{suspendedCountStr}</0> <2>devices in this fleet</2> are suspended because their local configuration is newer than the server&apos;s record. These devices will not receive updates until they are resumed._one": "<0>{suspendedCountStr}</0> <2>device in this fleet</2> is suspended because its local configuration is newer than the server&apos;s record. This device will not receive updates until it is resumed.",
+  "<0>{suspendedCountStr}</0> <2>devices in this fleet</2> are suspended because their local configuration is newer than the server&apos;s record. These devices will not receive updates until they are resumed._other": "<0>{suspendedCountStr}</0> <2>devices in this fleet</2> are suspended because their local configuration is newer than the server&apos;s record. These devices will not receive updates until they are resumed.",
+  "<0>{suspendedCountStr}</0> devices are suspended because their local configuration is newer than the server&apos;s record. These devices will not receive updates until they are resumed._one": "<0>{suspendedCountStr}</0> device is suspended because its local configuration is newer than the server&apos;s record. This device will not receive updates until it is resumed.",
+  "<0>{suspendedCountStr}</0> devices are suspended because their local configuration is newer than the server&apos;s record. These devices will not receive updates until they are resumed._other": "<0>{suspendedCountStr}</0> devices are suspended because their local configuration is newer than the server&apos;s record. These devices will not receive updates until they are resumed.",
+  "Resume suspended devices": "Resume suspended devices",
+  "Suspended devices detected": "Suspended devices detected",
+  "<0>Warning:</0> Please review this fleet&apos;s configuration before taking action. Resuming a device will cause it to apply the current specification, which may be older than what is on the device.": "<0>Warning:</0> Please review this fleet&apos;s configuration before taking action. Resuming a device will cause it to apply the current specification, which may be older than what is on the device.",
+  "<0>Warning:</0> Please review device configurations before taking action. Resuming a device will cause it to apply the current specification, which may be older than what is on the device.": "<0>Warning:</0> Please review device configurations before taking action. Resuming a device will cause it to apply the current specification, which may be older than what is on the device.",
   "No results found": "No results found",
   "Clear all filters and try again.": "Clear all filters and try again.",
   "Select all rows": "Select all rows",
@@ -764,6 +828,7 @@
   "< 1 minute ago": "< 1 minute ago",
   "Device is bound to a fleet and its configurations cannot be edited.": "Device is bound to a fleet and its configurations cannot be edited.",
   "Device decommissioning already started.": "Device decommissioning already started.",
+  "Device is not suspended.": "Device is not suspended.",
   "Error": "Error",
   "Degraded": "Degraded",
   "Healthy": "Healthy",
@@ -771,11 +836,11 @@
   "Starting": "Starting",
   "Running": "Running",
   "Completed": "Completed",
-  "Awaiting reconnect": "Awaiting reconnect",
-  "Updates paused": "Updates paused",
   "Rebooting": "Rebooting",
   "Powered Off": "Powered Off",
   "Online": "Online",
+  "Pending sync": "Pending sync",
+  "Suspended": "Suspended",
   "Decommissioned": "Decommissioned",
   "Decommissioning": "Decommissioning",
   "Enrolled": "Enrolled",
diff --git a/libs/types/index.ts b/libs/types/index.ts
index aec5d0cd8..d5ec1293e 100644
--- a/libs/types/index.ts
+++ b/libs/types/index.ts
@@ -50,6 +50,8 @@ export type { DeviceOsStatus } from './models/DeviceOsStatus';
 export type { DeviceOwnershipChangedDetails } from './models/DeviceOwnershipChangedDetails';
 export type { DeviceResourceStatus } from './models/DeviceResourceStatus';
 export { DeviceResourceStatusType } from './models/DeviceResourceStatusType';
+export type { DeviceResumeRequest } from './models/DeviceResumeRequest';
+export type { DeviceResumeResponse } from './models/DeviceResumeResponse';
 export type { DeviceSpec } from './models/DeviceSpec';
 export type { DevicesSummary } from './models/DevicesSummary';
 export type { DeviceStatus } from './models/DeviceStatus';
@@ -109,6 +111,7 @@ export type { ImageVolumeSource } from './models/ImageVolumeSource';
 export type { InlineApplicationProviderSpec } from './models/InlineApplicationProviderSpec';
 export type { InlineConfigProviderSpec } from './models/InlineConfigProviderSpec';
 export type { InternalTaskFailedDetails } from './models/InternalTaskFailedDetails';
+export type { InternalTaskPermanentlyFailedDetails } from './models/InternalTaskPermanentlyFailedDetails';
 export type { KubernetesSecretProviderSpec } from './models/KubernetesSecretProviderSpec';
 export type { LabelList } from './models/LabelList';
 export type { LabelSelector } from './models/LabelSelector';
diff --git a/libs/types/models/DeviceResumeRequest.ts b/libs/types/models/DeviceResumeRequest.ts
new file mode 100644
index 000000000..60a767598
--- /dev/null
+++ b/libs/types/models/DeviceResumeRequest.ts
@@ -0,0 +1,18 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Request to resume devices based on label selector and/or field selector. At least one selector must be provided.
+ */
+export type DeviceResumeRequest = {
+  /**
+   * A selector to restrict the list of devices to resume by their labels. Uses the same format as Kubernetes label selectors (e.g., "key1=value1,key2!=value2").
+   */
+  labelSelector?: string;
+  /**
+   * A selector to restrict the list of devices to resume by their fields. Uses the same format as Kubernetes field selectors (e.g., "metadata.name=device1,status.phase!=Pending").
+   */
+  fieldSelector?: string;
+};
+
diff --git a/libs/types/models/DeviceResumeResponse.ts b/libs/types/models/DeviceResumeResponse.ts
new file mode 100644
index 000000000..ac03e5137
--- /dev/null
+++ b/libs/types/models/DeviceResumeResponse.ts
@@ -0,0 +1,14 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Response from resuming devices.
+ */
+export type DeviceResumeResponse = {
+  /**
+   * Number of devices that were successfully resumed.
+   */
+  resumedDevices: number;
+};
+
diff --git a/libs/types/models/Event.ts b/libs/types/models/Event.ts
index b93289251..0f7d6f82a 100644
--- a/libs/types/models/Event.ts
+++ b/libs/types/models/Event.ts
@@ -67,6 +67,7 @@ export namespace Event {
     DEVICE_DISCONNECTED = 'DeviceDisconnected',
     DEVICE_IS_REBOOTING = 'DeviceIsRebooting',
     DEVICE_CONFLICT_PAUSED = 'DeviceConflictPaused',
+    DEVICE_CONFLICT_RESOLVED = 'DeviceConflictResolved',
     DEVICE_CONNECTED = 'DeviceConnected',
     DEVICE_CONTENT_UP_TO_DATE = 'DeviceContentUpToDate',
     DEVICE_CONTENT_OUT_OF_DATE = 'DeviceContentOutOfDate',
@@ -79,6 +80,7 @@ export namespace Event {
     DEVICE_SPEC_VALID = 'DeviceSpecValid',
     DEVICE_SPEC_INVALID = 'DeviceSpecInvalid',
     INTERNAL_TASK_FAILED = 'InternalTaskFailed',
+    INTERNAL_TASK_PERMANENTLY_FAILED = 'InternalTaskPermanentlyFailed',
     REPOSITORY_ACCESSIBLE = 'RepositoryAccessible',
     REPOSITORY_INACCESSIBLE = 'RepositoryInaccessible',
     REFERENCED_REPOSITORY_UPDATED = 'ReferencedRepositoryUpdated',
diff --git a/libs/types/models/EventDetails.ts b/libs/types/models/EventDetails.ts
index 8adf0ad2e..f5f229c10 100644
--- a/libs/types/models/EventDetails.ts
+++ b/libs/types/models/EventDetails.ts
@@ -12,11 +12,12 @@ import type { FleetRolloutDeviceSelectedDetails } from './FleetRolloutDeviceSele
 import type { FleetRolloutFailedDetails } from './FleetRolloutFailedDetails';
 import type { FleetRolloutStartedDetails } from './FleetRolloutStartedDetails';
 import type { InternalTaskFailedDetails } from './InternalTaskFailedDetails';
+import type { InternalTaskPermanentlyFailedDetails } from './InternalTaskPermanentlyFailedDetails';
 import type { ReferencedRepositoryUpdatedDetails } from './ReferencedRepositoryUpdatedDetails';
 import type { ResourceSyncCompletedDetails } from './ResourceSyncCompletedDetails';
 import type { ResourceUpdatedDetails } from './ResourceUpdatedDetails';
 /**
  * Event-specific details, structured based on event type.
  */
-export type EventDetails = (ResourceUpdatedDetails | DeviceOwnershipChangedDetails | DeviceMultipleOwnersDetectedDetails | DeviceMultipleOwnersResolvedDetails | InternalTaskFailedDetails | ResourceSyncCompletedDetails | ReferencedRepositoryUpdatedDetails | FleetRolloutStartedDetails | FleetRolloutFailedDetails | FleetRolloutCompletedDetails | FleetRolloutBatchDispatchedDetails | FleetRolloutBatchCompletedDetails | FleetRolloutDeviceSelectedDetails);
+export type EventDetails = (ResourceUpdatedDetails | DeviceOwnershipChangedDetails | DeviceMultipleOwnersDetectedDetails | DeviceMultipleOwnersResolvedDetails | InternalTaskFailedDetails | InternalTaskPermanentlyFailedDetails | ResourceSyncCompletedDetails | ReferencedRepositoryUpdatedDetails | FleetRolloutStartedDetails | FleetRolloutFailedDetails | FleetRolloutCompletedDetails | FleetRolloutBatchDispatchedDetails | FleetRolloutBatchCompletedDetails | FleetRolloutDeviceSelectedDetails);
 
diff --git a/libs/types/models/InternalTaskPermanentlyFailedDetails.ts b/libs/types/models/InternalTaskPermanentlyFailedDetails.ts
new file mode 100644
index 000000000..8ae7b0639
--- /dev/null
+++ b/libs/types/models/InternalTaskPermanentlyFailedDetails.ts
@@ -0,0 +1,21 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { Event } from './Event';
+export type InternalTaskPermanentlyFailedDetails = {
+  /**
+   * The type of detail for discriminator purposes.
+   */
+  detailType: 'InternalTaskPermanentlyFailed';
+  /**
+   * The error message describing the permanent failure.
+   */
+  errorMessage: string;
+  /**
+   * Number of times the task was retried before being marked as permanently failed.
+   */
+  retryCount: number;
+  originalEvent: Event;
+};
+
diff --git a/libs/types/models/PatchRequest.ts b/libs/types/models/PatchRequest.ts
index cd0bed391..1866d3233 100644
--- a/libs/types/models/PatchRequest.ts
+++ b/libs/types/models/PatchRequest.ts
@@ -14,5 +14,5 @@ export type PatchRequest = Array<{
   /**
    * The operation to perform.
    */
-  op: 'add' | 'replace' | 'remove';
+  op: 'add' | 'replace' | 'remove' | 'test';
 }>;
diff --git a/libs/ui-components/src/components/DetailsPage/DetailsPage.tsx b/libs/ui-components/src/components/DetailsPage/DetailsPage.tsx
index 0594ba751..dd03765f0 100644
--- a/libs/ui-components/src/components/DetailsPage/DetailsPage.tsx
+++ b/libs/ui-components/src/components/DetailsPage/DetailsPage.tsx
@@ -31,6 +31,7 @@ export type DetailsPageProps = {
   resourceLink: Route;
   actions?: React.ReactNode;
   nav?: React.ReactNode;
+  banner?: React.ReactNode;
 };
 
 const DetailsPage = ({
@@ -45,6 +46,7 @@ const DetailsPage = ({
   resourceTypeLabel,
   actions,
   nav,
+  banner,
 }: DetailsPageProps) => {
   const { t } = useTranslation();
   let content = children;
@@ -86,6 +88,7 @@ const DetailsPage = ({
           <SplitItem>{actions}</SplitItem>
         </Split>
       </PageSection>
+      {banner}
       {nav && (
         <PageSection variant="light" type="nav" className="fctl-details-page__nav">
           {nav}
diff --git a/libs/ui-components/src/components/DetailsPage/DetailsPageActions.tsx b/libs/ui-components/src/components/DetailsPage/DetailsPageActions.tsx
index 7e1c3fb16..a21597eaf 100644
--- a/libs/ui-components/src/components/DetailsPage/DetailsPageActions.tsx
+++ b/libs/ui-components/src/components/DetailsPage/DetailsPageActions.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Dropdown, DropdownItem, MenuToggle } from '@patternfly/react-core';
+import { Trans } from 'react-i18next';
 
 import { DeviceDecommissionTargetType } from '@flightctl/types';
 
@@ -7,6 +8,7 @@ import { useTranslation } from '../../hooks/useTranslation';
 import { getDisabledTooltipProps } from '../../utils/tooltip';
 import DeleteModal from '../modals/DeleteModal/DeleteModal';
 import DecommissionModal from '../modals/DecommissionModal/DecommissionModal';
+import ResumeDevicesModal from '../modals/ResumeDevicesModal/ResumeDevicesModal';
 
 type DeleteActionProps = {
   onDelete: () => Promise<unknown>;
@@ -21,6 +23,13 @@ type DecommissionActionProps = {
   disabledReason?: string;
 };
 
+type ResumeActionProps = {
+  deviceId: string;
+  alias?: string;
+  disabledReason?: string;
+  onResumeComplete?: () => void;
+};
+
 export const useDeleteAction = ({
   resourceType,
   resourceName,
@@ -73,6 +82,42 @@ export const useDecommissionAction = ({ onDecommission, disabledReason }: Decomm
   return { decommissionAction, decommissionModal };
 };
 
+export const useResumeAction = ({ disabledReason, deviceId, alias, onResumeComplete }: ResumeActionProps) => {
+  const { t } = useTranslation();
+  const [isResumeModalOpen, setIsResumeModalOpen] = React.useState(false);
+  const resumeProps = getDisabledTooltipProps(disabledReason);
+  const deviceNameOrAlias = alias || deviceId;
+  const resumeAction = (
+    <DropdownItem onClick={() => setIsResumeModalOpen(true)} {...resumeProps}>
+      {t('Resume device')}
+    </DropdownItem>
+  );
+
+  const resumeSelector = {
+    fieldSelector: `metadata.name=${deviceId}`,
+  };
+  const resumeModal = isResumeModalOpen && (
+    <ResumeDevicesModal
+      mode="device"
+      title={
+        <Trans t={t}>
+          You are about to resume device <strong>{deviceNameOrAlias}</strong>
+        </Trans>
+      }
+      selector={resumeSelector}
+      expectedCount={1}
+      onClose={(hasResumed) => {
+        setIsResumeModalOpen(false);
+        if (hasResumed) {
+          onResumeComplete?.();
+        }
+      }}
+    />
+  );
+
+  return { resumeAction, resumeModal };
+};
+
 const DetailsPageActions = ({ children }: React.PropsWithChildren) => {
   const { t } = useTranslation();
   const [actionsOpen, setActionsOpen] = React.useState(false);
diff --git a/libs/ui-components/src/components/Device/DeviceDetails/DeviceDetailsPage.tsx b/libs/ui-components/src/components/Device/DeviceDetails/DeviceDetailsPage.tsx
index 936979697..b61547cc1 100644
--- a/libs/ui-components/src/components/Device/DeviceDetails/DeviceDetailsPage.tsx
+++ b/libs/ui-components/src/components/Device/DeviceDetails/DeviceDetailsPage.tsx
@@ -1,25 +1,37 @@
 import * as React from 'react';
+import { Trans } from 'react-i18next';
 import { Button, DropdownItem, DropdownList, Nav, NavList } from '@patternfly/react-core';
 
-import { Device, DeviceDecommission, DeviceDecommissionTargetType, ResourceKind } from '@flightctl/types';
+import {
+  Device,
+  DeviceDecommission,
+  DeviceDecommissionTargetType,
+  DeviceSummaryStatusType,
+  ResourceKind,
+} from '@flightctl/types';
 import { useFetchPeriodically } from '../../../hooks/useFetchPeriodically';
 import { useFetch } from '../../../hooks/useFetch';
 import { getDisabledTooltipProps } from '../../../utils/tooltip';
 import DetailsPage from '../../DetailsPage/DetailsPage';
-import DetailsPageActions, { useDecommissionAction, useDeleteAction } from '../../DetailsPage/DetailsPageActions';
+import DetailsPageActions, {
+  useDecommissionAction,
+  useDeleteAction,
+  useResumeAction,
+} from '../../DetailsPage/DetailsPageActions';
 import { useTranslation } from '../../../hooks/useTranslation';
 import { ROUTE, useNavigate } from '../../../hooks/useNavigate';
 import { useAppContext } from '../../../hooks/useAppContext';
 import DeviceDetailsTab from './DeviceDetailsTab';
 import TerminalTab from './TerminalTab';
 import NavItem from '../../NavItem/NavItem';
-import { getEditDisabledReason, isDeviceEnrolled } from '../../../utils/devices';
+import { getEditDisabledReason, getResumeDisabledReason, isDeviceEnrolled } from '../../../utils/devices';
 import { RESOURCE, VERB } from '../../../types/rbac';
 import { useAccessReview } from '../../../hooks/useAccessReview';
 import EventsCard from '../../Events/EventsCard';
 import PageWithPermissions from '../../common/PageWithPermissions';
 import YamlEditor from '../../common/CodeEditor/YamlEditor';
 import DeviceAliasEdit from './DeviceAliasEdit';
+import { SystemRestoreBanners } from '../../SystemRestore/SystemRestoreBanners';
 
 type DeviceDetailsPageProps = React.PropsWithChildren<{ hideTerminal?: boolean }>;
 
@@ -35,12 +47,14 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
 
   const deviceLabels = device?.metadata.labels;
   const deviceAlias = deviceLabels?.alias;
+  const deviceNameOrAlias = deviceAlias || deviceId;
   const isEnrolled = !device || isDeviceEnrolled(device);
 
   const [hasTerminalAccess] = useAccessReview(RESOURCE.DEVICE_CONSOLE, VERB.GET);
   const [canDelete] = useAccessReview(RESOURCE.DEVICE, VERB.DELETE);
   const [canEdit] = useAccessReview(RESOURCE.DEVICE, VERB.PATCH);
   const [canDecommission] = useAccessReview(RESOURCE.DEVICE_DECOMMISSION, VERB.UPDATE);
+  const [canResume] = useAccessReview(RESOURCE.DEVICE_RESUME, VERB.UPDATE);
 
   const canOpenTerminal = hasTerminalAccess && isEnrolled;
 
@@ -49,7 +63,7 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
       await remove(`devices/${deviceId}`);
       navigate(ROUTE.DEVICES);
     },
-    resourceName: deviceAlias || deviceId,
+    resourceName: deviceNameOrAlias,
     resourceType: 'device',
     buttonLabel: isEnrolled ? undefined : t('Delete forever'),
   });
@@ -64,7 +78,33 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
     },
   });
 
+  const { resumeAction, resumeModal } = useResumeAction({
+    deviceId,
+    alias: deviceAlias,
+    disabledReason: device ? getResumeDisabledReason(device, t) : undefined,
+    onResumeComplete: refetch,
+  });
+
   const editActionProps = device ? getDisabledTooltipProps(getEditDisabledReason(device, t)) : undefined;
+  const resumeDevice = {
+    actionText: t('Resume device'),
+    title: (
+      <Trans t={t}>
+        You are about to resume <strong>{deviceNameOrAlias}</strong>
+      </Trans>
+    ),
+    requestSelector: {
+      fieldSelector: `metadata.name=${deviceId}`,
+    },
+  };
+
+  const deviceSummaryStatus = device?.status?.summary.status;
+  const deviceSummary = {
+    [DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused]:
+      deviceSummaryStatus === DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused ? 1 : 0,
+    [DeviceSummaryStatusType.DeviceSummaryStatusAwaitingReconnect]:
+      deviceSummaryStatus === DeviceSummaryStatusType.DeviceSummaryStatusAwaitingReconnect ? 1 : 0,
+  };
 
   return (
     <DetailsPage
@@ -86,6 +126,17 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
           deviceAlias
         )
       }
+      banner={
+        device && (
+          <SystemRestoreBanners
+            mode="device"
+            resumeAction={resumeDevice}
+            summaryStatus={deviceSummary}
+            onResumeComplete={refetch}
+            className="pf-v5-u-pt-0 pf-v5-u-px-lg"
+          />
+        )
+      }
       resourceLink={ROUTE.DEVICES}
       resourceType="Devices"
       resourceTypeLabel={t('Devices')}
@@ -111,6 +162,7 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
                   {t('Edit device configurations')}
                 </DropdownItem>
               )}
+              {canResume && resumeAction}
               {canDecommission && decommissionAction}
             </DropdownList>
           </DetailsPageActions>
@@ -143,7 +195,7 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
         </Routes>
       )}
 
-      {deleteModal || decommissionModal}
+      {deleteModal || decommissionModal || resumeModal}
     </DetailsPage>
   );
 };
diff --git a/libs/ui-components/src/components/Device/DevicesPage/DevicesPage.tsx b/libs/ui-components/src/components/Device/DevicesPage/DevicesPage.tsx
index 5ed9395bc..da3de6193 100644
--- a/libs/ui-components/src/components/Device/DevicesPage/DevicesPage.tsx
+++ b/libs/ui-components/src/components/Device/DevicesPage/DevicesPage.tsx
@@ -102,6 +102,7 @@ const DevicesPage = ({ canListER }: { canListER: boolean }) => {
               setSelectedLabels={setSelectedLabels}
               isFilterUpdating={updating}
               pagination={pagination}
+              refetchDevices={refetch}
             />
           )}
         </ListPageBody>
diff --git a/libs/ui-components/src/components/Device/DevicesPage/EnrolledDeviceTableRow.tsx b/libs/ui-components/src/components/Device/DevicesPage/EnrolledDeviceTableRow.tsx
index ad84b4f24..8d240add5 100644
--- a/libs/ui-components/src/components/Device/DevicesPage/EnrolledDeviceTableRow.tsx
+++ b/libs/ui-components/src/components/Device/DevicesPage/EnrolledDeviceTableRow.tsx
@@ -4,7 +4,7 @@ import { ActionsColumn, OnSelect, Td, Tr } from '@patternfly/react-table';
 import { Device } from '@flightctl/types';
 import DeviceFleet from '../DeviceDetails/DeviceFleet';
 import { timeSinceText } from '../../../utils/dates';
-import { getDecommissionDisabledReason, getEditDisabledReason } from '../../../utils/devices';
+import { getDecommissionDisabledReason, getEditDisabledReason, getResumeDisabledReason } from '../../../utils/devices';
 import { getDisabledTooltipProps } from '../../../utils/tooltip';
 import { ListAction } from '../../ListPage/types';
 import ApplicationSummaryStatus from '../../Status/ApplicationSummaryStatus';
@@ -22,6 +22,8 @@ type EnrolledDeviceTableRowProps = {
   canEdit: boolean;
   canDecommission: boolean;
   decommissionAction: ListAction;
+  canResume: boolean;
+  resumeAction: ListAction;
 };
 
 const EnrolledDeviceTableRow = ({
@@ -32,6 +34,8 @@ const EnrolledDeviceTableRow = ({
   canEdit,
   canDecommission,
   decommissionAction,
+  canResume,
+  resumeAction,
 }: EnrolledDeviceTableRowProps) => {
   const { t } = useTranslation();
   const navigate = useNavigate();
@@ -39,6 +43,7 @@ const EnrolledDeviceTableRow = ({
   const deviceAlias = device.metadata.labels?.alias;
   const editActionProps = getDisabledTooltipProps(getEditDisabledReason(device, t));
   const decommissionDisabledReason = getDecommissionDisabledReason(device, t);
+  const resumeDisabledReason = getResumeDisabledReason(device, t);
 
   return (
     <Tr>
@@ -84,6 +89,15 @@ const EnrolledDeviceTableRow = ({
               title: t('View device details'),
               onClick: () => navigate({ route: ROUTE.DEVICE_DETAILS, postfix: deviceName }),
             },
+            ...(canResume
+              ? [
+                  resumeAction({
+                    resourceId: deviceName,
+                    resourceName: deviceAlias,
+                    disabledReason: resumeDisabledReason,
+                  }),
+                ]
+              : []),
             ...(canDecommission
               ? [
                   decommissionAction({
diff --git a/libs/ui-components/src/components/Device/DevicesPage/EnrolledDevicesTable.tsx b/libs/ui-components/src/components/Device/DevicesPage/EnrolledDevicesTable.tsx
index 89dd47810..88687849b 100644
--- a/libs/ui-components/src/components/Device/DevicesPage/EnrolledDevicesTable.tsx
+++ b/libs/ui-components/src/components/Device/DevicesPage/EnrolledDevicesTable.tsx
@@ -20,7 +20,7 @@ import {
 } from '../../Status/utils';
 
 import Table, { ApiSortTableColumn } from '../../Table/Table';
-import { useDecommissionListAction } from '../../ListPage/ListPageActions';
+import { useDecommissionListAction, useResumeListAction } from '../../ListPage/ListPageActions';
 import TablePagination from '../../Table/TablePagination';
 import MassDecommissionDeviceModal from '../../modals/massModals/MassDecommissionDeviceModal/MassDecommissionDeviceModal';
 import AddDeviceModal from '../AddDeviceModal/AddDeviceModal';
@@ -28,6 +28,7 @@ import { EnrolledDevicesEmptyState } from './DevicesEmptyStates';
 import DeviceTableToolbar from './DeviceTableToolbar';
 import EnrolledDeviceTableRow from './EnrolledDeviceTableRow';
 import { FilterSearchParams } from '../../../utils/status/devices';
+import { GlobalSystemRestoreBanners } from '../../SystemRestore/SystemRestoreBanners';
 
 interface EnrolledDeviceTableProps {
   devices: Array<Device>;
@@ -43,6 +44,7 @@ interface EnrolledDeviceTableProps {
   setSelectedLabels: (labels: FlightCtlLabel[]) => void;
   isFilterUpdating: boolean;
   pagination: Pick<PaginationDetails<DeviceList>, 'currentPage' | 'setCurrentPage' | 'itemCount'>;
+  refetchDevices: VoidFunction;
   // getSortParams: (columnIndex: number) => ThProps['sort'];
 }
 
@@ -87,6 +89,7 @@ const EnrolledDevicesTable = ({
   hasFiltersEnabled,
   isFilterUpdating,
   pagination,
+  refetchDevices,
 }: EnrolledDeviceTableProps) => {
   const { t } = useTranslation();
   const { put } = useFetch();
@@ -97,6 +100,7 @@ const EnrolledDevicesTable = ({
 
   const { onRowSelect, hasSelectedRows, isAllSelected, isRowSelected, setAllSelected } = useTableSelect();
 
+  const { action: resumeDeviceAction, modal: resumeDeviceModal } = useResumeListAction(refetchDevices);
   const { action: decommissionDeviceAction, modal: decommissionDeviceModal } = useDecommissionListAction({
     resourceType: 'Device',
     onConfirm: async (deviceId: string, params) => {
@@ -109,6 +113,7 @@ const EnrolledDevicesTable = ({
 
   const [canEdit] = useAccessReview(RESOURCE.DEVICE, VERB.PATCH);
   const [canDecommission] = useAccessReview(RESOURCE.DEVICE_DECOMMISSION, VERB.UPDATE);
+  const [canResume] = useAccessReview(RESOURCE.DEVICE_RESUME, VERB.UPDATE);
 
   const clearAllFilters = () => {
     if (hasFiltersEnabled) {
@@ -125,6 +130,8 @@ const EnrolledDevicesTable = ({
 
   return (
     <>
+      <GlobalSystemRestoreBanners onResumeComplete={refetchDevices} />
+
       <DeviceTableToolbar
         nameOrAlias={nameOrAlias}
         setNameOrAlias={setNameOrAlias}
@@ -186,6 +193,8 @@ const EnrolledDevicesTable = ({
               canEdit={canEdit}
               canDecommission={canDecommission}
               decommissionAction={decommissionDeviceAction}
+              canResume={canResume}
+              resumeAction={resumeDeviceAction}
             />
           ))}
         </Tbody>
@@ -194,7 +203,7 @@ const EnrolledDevicesTable = ({
       {!hasFiltersEnabled && devices.length === 0 && (
         <EnrolledDevicesEmptyState onAddDevice={() => setAddDeviceModal(true)} />
       )}
-      {decommissionDeviceModal}
+      {decommissionDeviceModal || resumeDeviceModal}
       {addDeviceModal && <AddDeviceModal onClose={() => setAddDeviceModal(false)} />}
       {isMassDecommissionModalOpen && (
         <MassDecommissionDeviceModal
diff --git a/libs/ui-components/src/components/Events/useEvents.ts b/libs/ui-components/src/components/Events/useEvents.ts
index a74511e5e..46efaa196 100644
--- a/libs/ui-components/src/components/Events/useEvents.ts
+++ b/libs/ui-components/src/components/Events/useEvents.ts
@@ -78,11 +78,13 @@ const getEventReasonTitles = (t: TFunction, kindType: string): Record<Event.reas
     [Event.reason.DEVICE_SPEC_VALID]: t('Device specification has returned to a valid state'),
     [Event.reason.DEVICE_SPEC_INVALID]: t('Device specification is invalid'),
     [Event.reason.DEVICE_CONFLICT_PAUSED]: t('Device is paused after database restore'),
+    [Event.reason.DEVICE_CONFLICT_RESOLVED]: t('Device conflict has been resolved'),
     // Enrollment request events
     [Event.reason.ENROLLMENT_REQUEST_APPROVED]: t('Enrollment request was approved'),
     [Event.reason.ENROLLMENT_REQUEST_APPROVAL_FAILED]: t('Enrollment request approval failed'),
     // Internal task events
     [Event.reason.INTERNAL_TASK_FAILED]: t('Internal task failed'),
+    [Event.reason.INTERNAL_TASK_PERMANENTLY_FAILED]: t('Internal task permanently failed'),
     // Repository events
     [Event.reason.REPOSITORY_ACCESSIBLE]: t('Repository is accessible'),
     [Event.reason.REPOSITORY_INACCESSIBLE]: t('Repository is inaccessible'),
diff --git a/libs/ui-components/src/components/Fleet/FleetDetails/FleetDetailsPage.tsx b/libs/ui-components/src/components/Fleet/FleetDetails/FleetDetailsPage.tsx
index 57a09ea0d..ab4ec2cd2 100644
--- a/libs/ui-components/src/components/Fleet/FleetDetails/FleetDetailsPage.tsx
+++ b/libs/ui-components/src/components/Fleet/FleetDetails/FleetDetailsPage.tsx
@@ -13,8 +13,9 @@ import NavItem from '../../NavItem/NavItem';
 import DetailsPage from '../../DetailsPage/DetailsPage';
 import DetailsPageActions from '../../DetailsPage/DetailsPageActions';
 import DeleteFleetModal from '../DeleteFleetModal/DeleteFleetModal';
-import FleetDetailsContent from './FleetDetailsContent';
 import YamlEditor from '../../common/CodeEditor/YamlEditor';
+import FleetDetailsContent from './FleetDetailsContent';
+import FleetRestoreBanner from './FleetRestoreBanner';
 
 const FleetDetailPage = () => {
   const { t } = useTranslation();
@@ -45,6 +46,7 @@ const FleetDetailPage = () => {
       resourceLink={ROUTE.FLEETS}
       resourceType="Fleets"
       resourceTypeLabel={t('Fleets')}
+      banner={<FleetRestoreBanner fleet={fleet} refetch={refetch} />}
       nav={
         <Nav variant="tertiary">
           <NavList>
@@ -98,10 +100,7 @@ const FleetDetailPage = () => {
           <Routes>
             <Route index element={<Navigate to="details" replace />} />
             <Route path="details" element={<FleetDetailsContent fleet={fleet} />} />
-            <Route
-              path="yaml"
-              element={<YamlEditor filename={fleet.metadata.name || 'fleet'} apiObj={fleet} refetch={refetch} />}
-            />
+            <Route path="yaml" element={<YamlEditor filename={fleetId} apiObj={fleet} refetch={refetch} />} />
           </Routes>
           {isDeleteModalOpen && (
             <DeleteFleetModal
diff --git a/libs/ui-components/src/components/Fleet/FleetDetails/FleetDevicesCharts.tsx b/libs/ui-components/src/components/Fleet/FleetDetails/FleetDevicesCharts.tsx
index e9fed3f45..5310fe02f 100644
--- a/libs/ui-components/src/components/Fleet/FleetDetails/FleetDevicesCharts.tsx
+++ b/libs/ui-components/src/components/Fleet/FleetDetails/FleetDevicesCharts.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
-import { DevicesSummary } from '@flightctl/types';
+import { DeviceSummaryStatusType, DevicesSummary } from '@flightctl/types';
 import { useTranslation } from '../../../hooks/useTranslation';
-import { FilterSearchParams, getDeviceStatusItems } from '../../../utils/status/devices';
+import { FilterSearchParams, getOverviewDeviceStatusItems } from '../../../utils/status/devices';
 import { getSystemUpdateStatusItems } from '../../../utils/status/system';
 import {
   getApplicationStatusHelperText,
@@ -19,6 +19,11 @@ interface FleetDevicesChartsProps {
   devicesSummary: DevicesSummary;
 }
 
+const systemRestoreStatuses = [
+  DeviceSummaryStatusType.DeviceSummaryStatusAwaitingReconnect,
+  DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused,
+];
+
 const getBaseFleetQuery = (fleetId: string) => {
   const baseQuery = new URLSearchParams();
   baseQuery.set(FilterSearchParams.Fleet, fleetId);
@@ -78,7 +83,8 @@ const DevicesByDeviceStatusChart = ({
 }) => {
   const { t } = useTranslation();
 
-  const statusItems = getDeviceStatusItems(t);
+  const excludeStatuses = systemRestoreStatuses.filter((status) => !deviceStatus[status]);
+  const statusItems = getOverviewDeviceStatusItems(t, excludeStatuses);
 
   const deviceStatusData = toChartData(
     deviceStatus,
diff --git a/libs/ui-components/src/components/Fleet/FleetDetails/FleetRestoreBanner.tsx b/libs/ui-components/src/components/Fleet/FleetDetails/FleetRestoreBanner.tsx
new file mode 100644
index 000000000..039aacf73
--- /dev/null
+++ b/libs/ui-components/src/components/Fleet/FleetDetails/FleetRestoreBanner.tsx
@@ -0,0 +1,46 @@
+import * as React from 'react';
+import { Trans } from 'react-i18next';
+import { DeviceSummaryStatusType, Fleet } from '@flightctl/types';
+
+import { SystemRestoreBanners } from '../../SystemRestore/SystemRestoreBanners';
+import { fromAPILabel, labelToExactApiMatchString } from '../../../utils/labels';
+import { useTranslation } from '../../../hooks/useTranslation';
+
+const FleetRestoreBanner = ({ fleet, refetch }: { fleet?: Fleet; refetch: VoidFunction }) => {
+  const { t } = useTranslation();
+  if (!fleet) {
+    return null;
+  }
+
+  const fleetId = fleet.metadata.name as string;
+
+  const fleetDeviceStatuses = fleet?.status?.devicesSummary?.summaryStatus;
+  const suspendedDevicesCountNum =
+    fleetDeviceStatuses?.[DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused] || 0;
+  const suspendedDevicesCount = suspendedDevicesCountNum.toString();
+
+  return (
+    <SystemRestoreBanners
+      mode="fleet"
+      summaryStatus={fleetDeviceStatuses}
+      resumeAction={{
+        actionText: t('Resume all'),
+        title: (
+          <Trans t={t} count={suspendedDevicesCountNum}>
+            You are about to resume all<strong>{suspendedDevicesCount}</strong> suspended devices in{' '}
+            <strong>{fleetId}</strong>
+          </Trans>
+        ),
+        requestSelector: {
+          labelSelector: fromAPILabel(fleet.spec.selector?.matchLabels || {})
+            .map(labelToExactApiMatchString)
+            .join(','),
+        },
+      }}
+      onResumeComplete={refetch}
+      className="pf-v5-u-pt-0 pf-v5-u-px-lg"
+    />
+  );
+};
+
+export default FleetRestoreBanner;
diff --git a/libs/ui-components/src/components/Fleet/FleetsPage.tsx b/libs/ui-components/src/components/Fleet/FleetsPage.tsx
index bb0846616..c61db2b7d 100644
--- a/libs/ui-components/src/components/Fleet/FleetsPage.tsx
+++ b/libs/ui-components/src/components/Fleet/FleetsPage.tsx
@@ -37,6 +37,7 @@ import ButtonWithPermissions from '../common/ButtonWithPermissions';
 import { RESOURCE, VERB } from '../../types/rbac';
 import PageWithPermissions from '../common/PageWithPermissions';
 import { useFleetImportAccessReview } from '../../hooks/useFleetImportAccessReview';
+import { GlobalSystemRestoreBanners } from '../SystemRestore/SystemRestoreBanners';
 
 const FleetPageActions = ({ createText }: { createText?: string }) => {
   const { t } = useTranslation();
@@ -122,6 +123,7 @@ const FleetTable = () => {
 
   return (
     <ListPageBody error={error} loading={isLoading}>
+      <GlobalSystemRestoreBanners onResumeComplete={refetch} />
       <Toolbar inset={{ default: 'insetNone' }}>
         <ToolbarContent>
           <ToolbarGroup>
diff --git a/libs/ui-components/src/components/ListPage/ListPageActions.tsx b/libs/ui-components/src/components/ListPage/ListPageActions.tsx
index 2b4fb688d..c4fd7ae1b 100644
--- a/libs/ui-components/src/components/ListPage/ListPageActions.tsx
+++ b/libs/ui-components/src/components/ListPage/ListPageActions.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { TFunction } from 'react-i18next';
+import { TFunction, Trans } from 'react-i18next';
 
 import { DeviceDecommissionTargetType } from '@flightctl/types';
 import { ListAction, ListActionProps, ListActionResult } from './types';
@@ -8,9 +8,10 @@ import { useTranslation } from '../../hooks/useTranslation';
 import { getDisabledTooltipProps } from '../../utils/tooltip';
 import DeleteModal from '../modals/DeleteModal/DeleteModal';
 import DecommissionModal from '../modals/DecommissionModal/DecommissionModal';
+import ResumeDevicesModal from '../modals/ResumeDevicesModal/ResumeDevicesModal';
 
 type DeleteResourceType = 'EnrollmentRequest' | 'ResourceSync' | 'Device';
-type DecommissionResourceType = 'Device';
+type DeviceOnlyResourceType = 'Device';
 
 type ResourceType = 'Device' | 'EnrollmentRequest' | 'ResourceSync';
 
@@ -70,7 +71,7 @@ export const useDeleteListAction = ({
 
 export const useDecommissionListAction = ({
   onConfirm,
-}: ListActionProps<DecommissionResourceType, { target: DeviceDecommissionTargetType }>): ListActionResult => {
+}: ListActionProps<DeviceOnlyResourceType, { target: DeviceDecommissionTargetType }>): ListActionResult => {
   const { t } = useTranslation();
   const [decommissionDeviceId, setDecommissionDeviceId] = React.useState<string>();
 
@@ -100,3 +101,45 @@ export const useDecommissionListAction = ({
 
   return { action: decommissionAction, modal: decommissionModal };
 };
+
+export const useResumeListAction = (onResumeComplete?: VoidFunction): ListActionResult => {
+  const { t } = useTranslation();
+  const [deviceId, setDeviceId] = React.useState<string>();
+  const [deviceName, setDeviceName] = React.useState<string>();
+
+  const resumeAction: ListAction = ({ resourceId, resourceName, disabledReason }) => {
+    const popperProps = getDisabledTooltipProps(disabledReason);
+    return {
+      title: t('Resume device'),
+      ...popperProps,
+      onClick: () => {
+        setDeviceId(resourceId);
+        setDeviceName(resourceName || resourceId);
+      },
+    };
+  };
+
+  const onClose = (hasResumed?: boolean) => {
+    setDeviceId(undefined);
+    setDeviceName(undefined);
+    if (hasResumed) {
+      onResumeComplete?.();
+    }
+  };
+
+  const resumeModal = deviceId && (
+    <ResumeDevicesModal
+      mode="device"
+      title={
+        <Trans t={t}>
+          You are about to resume device <strong>{deviceName}</strong>
+        </Trans>
+      }
+      selector={{ fieldSelector: `metadata.name=${deviceId}` }}
+      expectedCount={1}
+      onClose={onClose}
+    />
+  );
+
+  return { action: resumeAction, modal: resumeModal };
+};
diff --git a/libs/ui-components/src/components/OverviewPage/Cards/Status/DeviceStatusChart.tsx b/libs/ui-components/src/components/OverviewPage/Cards/Status/DeviceStatusChart.tsx
index 583655ad5..a32ce110f 100644
--- a/libs/ui-components/src/components/OverviewPage/Cards/Status/DeviceStatusChart.tsx
+++ b/libs/ui-components/src/components/OverviewPage/Cards/Status/DeviceStatusChart.tsx
@@ -5,11 +5,16 @@ import { FlightCtlLabel } from '../../../../types/extraTypes';
 
 import { useTranslation } from '../../../../hooks/useTranslation';
 import { getDeviceStatusHelperText } from '../../../Status/utils';
-import { getDeviceStatusItems } from '../../../../utils/status/devices';
+import { getOverviewDeviceStatusItems } from '../../../../utils/status/devices';
 import { FilterSearchParams } from '../../../../utils/status/devices';
 import { toOverviewChartData } from './utils';
 import DonutChart from '../../../charts/DonutChart';
 
+const systemRestoreStatuses = [
+  DeviceSummaryStatusType.DeviceSummaryStatusAwaitingReconnect,
+  DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused,
+];
+
 const DeviceStatusChart = ({
   deviceStatus,
   labels,
@@ -21,7 +26,8 @@ const DeviceStatusChart = ({
 }) => {
   const { t } = useTranslation();
 
-  const statusItems = getDeviceStatusItems(t);
+  const excludeStatuses = systemRestoreStatuses.filter((status) => !deviceStatus[status]);
+  const statusItems = getOverviewDeviceStatusItems(t, excludeStatuses);
 
   const devStatusData = toOverviewChartData<DeviceSummaryStatusType>(
     deviceStatus,
diff --git a/libs/ui-components/src/components/OverviewPage/Overview.tsx b/libs/ui-components/src/components/OverviewPage/Overview.tsx
index d75ad8484..680854884 100644
--- a/libs/ui-components/src/components/OverviewPage/Overview.tsx
+++ b/libs/ui-components/src/components/OverviewPage/Overview.tsx
@@ -5,18 +5,21 @@ import { useAccessReview } from '../../hooks/useAccessReview';
 import { useAlertsEnabled } from '../../hooks/useAlertsEnabled';
 import { RESOURCE, VERB } from '../../types/rbac';
 import PageWithPermissions from '../common/PageWithPermissions';
+import { GlobalSystemRestoreBanners } from '../SystemRestore/SystemRestoreBanners';
 
 import AlertsCard from './Cards/Alerts/AlertsCard';
 import StatusCard from './Cards/Status/StatusCard';
 import TasksCard from './Cards/Tasks/TasksCard';
 
 const Overview = () => {
+  const alertsEnabled = useAlertsEnabled();
   const [canListDevices, devicesLoading] = useAccessReview(RESOURCE.DEVICE, VERB.LIST);
   const [canListErs, erLoading] = useAccessReview(RESOURCE.ENROLLMENT_REQUEST, VERB.LIST);
-  const alertsEnabled = useAlertsEnabled();
 
   return (
     <PageWithPermissions allowed={canListDevices || canListErs} loading={devicesLoading || erLoading}>
+      <GlobalSystemRestoreBanners className="pf-v5-u-py-0" />
+
       <Grid hasGutter>
         <GridItem md={alertsEnabled ? 9 : 12}>
           <Grid hasGutter>
diff --git a/libs/ui-components/src/components/Status/StatusDisplay.tsx b/libs/ui-components/src/components/Status/StatusDisplay.tsx
index c2772c1e7..93a7992fb 100644
--- a/libs/ui-components/src/components/Status/StatusDisplay.tsx
+++ b/libs/ui-components/src/components/Status/StatusDisplay.tsx
@@ -14,11 +14,29 @@ type StatusLabelProps = {
   messageTitle?: string;
   level: StatusLevel;
   customIcon?: React.ComponentClass<SVGIconProps>;
+  customColor?: string;
 };
 
-export const StatusDisplayContent = ({ label, messageTitle, message, level, customIcon }: StatusLabelProps) => {
-  const iconStatus = level === 'unknown' ? undefined : level;
+export const StatusDisplayContent = ({
+  label,
+  messageTitle,
+  message,
+  level,
+  customIcon,
+  customColor,
+}: StatusLabelProps) => {
+  const overrideStatus = level === 'unknown' || (level === 'custom' && customColor);
   const IconComponent = customIcon || getDefaultStatusIcon(level);
+  const iconColor = customColor || getDefaultStatusColor(level);
+
+  const icon = (
+    <Icon
+      status={overrideStatus ? undefined : level}
+      style={{ '--pf-v5-c-icon__content--Color': iconColor } as React.CSSProperties}
+    >
+      <IconComponent />
+    </Icon>
+  );
 
   if (message) {
     return (
@@ -29,18 +47,7 @@ export const StatusDisplayContent = ({ label, messageTitle, message, level, cust
         className="fctl-status-display-content__popover"
         hasAutoWidth={false}
       >
-        <Button
-          variant="link"
-          isInline
-          icon={
-            <Icon
-              status={iconStatus}
-              style={{ '--pf-v5-c-icon__content--Color': getDefaultStatusColor(level) } as React.CSSProperties}
-            >
-              <IconComponent />
-            </Icon>
-          }
-        >
+        <Button variant="link" isInline icon={icon}>
           {label}
         </Button>
       </Popover>
@@ -49,14 +56,7 @@ export const StatusDisplayContent = ({ label, messageTitle, message, level, cust
 
   return (
     <Flex className="ftcl_status-label">
-      <FlexItem>
-        <Icon
-          status={iconStatus}
-          style={{ '--pf-v5-c-icon__content--Color': getDefaultStatusColor(level) } as React.CSSProperties}
-        >
-          <IconComponent />
-        </Icon>
-      </FlexItem>
+      <FlexItem>{icon}</FlexItem>
       <FlexItem>{label}</FlexItem>
     </Flex>
   );
@@ -67,6 +67,7 @@ type StatusDisplayProps = {
     label: string;
     level: StatusLevel;
     customIcon?: React.ComponentClass<SVGIconProps>;
+    customColor?: string;
   };
   message?: React.ReactNode;
 };
@@ -77,7 +78,15 @@ const StatusDisplay = ({ item, message }: StatusDisplayProps) => {
     return <StatusDisplayContent level="unknown" label={t('Unknown')} />;
   }
 
-  return <StatusDisplayContent level={item.level} customIcon={item.customIcon} label={item.label} message={message} />;
+  return (
+    <StatusDisplayContent
+      level={item.level}
+      customIcon={item.customIcon}
+      customColor={item.customColor}
+      label={item.label}
+      message={message}
+    />
+  );
 };
 
 export default StatusDisplay;
diff --git a/libs/ui-components/src/components/SystemRestore/PendingSyncDevicesAlert.tsx b/libs/ui-components/src/components/SystemRestore/PendingSyncDevicesAlert.tsx
new file mode 100644
index 000000000..6798751cb
--- /dev/null
+++ b/libs/ui-components/src/components/SystemRestore/PendingSyncDevicesAlert.tsx
@@ -0,0 +1,36 @@
+import * as React from 'react';
+import { Alert } from '@patternfly/react-core';
+
+import { useAppContext } from '../../hooks/useAppContext';
+import { useTranslation } from '../../hooks/useTranslation';
+
+interface PendingSyncDevicesAlertProps {
+  forSingleDevice?: boolean;
+}
+
+const getBrand = (isRHEM: boolean | undefined) => (isRHEM ? 'RHEM' : 'Flight Control');
+
+export const PendingSyncDevicesAlert = ({ forSingleDevice }: PendingSyncDevicesAlertProps) => {
+  const { t } = useTranslation();
+  const { settings } = useAppContext();
+
+  const getMessage = () => {
+    if (forSingleDevice) {
+      return t(
+        '{{brand}} is waiting for the device to connect and report its status. It will report a ʼPending syncʼ status until it is able to reconnect. If it has configuration conflicts, it will report a ʼSuspendedʼ status and require manual action to resume.',
+        { brand: getBrand(settings.isRHEM) },
+      );
+    }
+
+    return t(
+      '{{brand}} is waiting for devices to connect and report their status. Devices will report a ʼPending syncʼ status until they are able to connect. Devices with configuration conflicts will report a ʼSuspendedʼ status and require manual action to resume.',
+      { brand: getBrand(settings.isRHEM) },
+    );
+  };
+
+  return (
+    <Alert variant="warning" isInline title={t('System recovery complete')}>
+      {getMessage()}
+    </Alert>
+  );
+};
diff --git a/libs/ui-components/src/components/SystemRestore/SuspendedDevicesAlert.tsx b/libs/ui-components/src/components/SystemRestore/SuspendedDevicesAlert.tsx
new file mode 100644
index 000000000..87b08b57c
--- /dev/null
+++ b/libs/ui-components/src/components/SystemRestore/SuspendedDevicesAlert.tsx
@@ -0,0 +1,144 @@
+import * as React from 'react';
+import { Trans } from 'react-i18next';
+import { Alert, AlertActionLink, Stack, StackItem } from '@patternfly/react-core';
+
+import { useTranslation } from '../../hooks/useTranslation';
+import MassResumeDevicesModal from '../modals/massModals/ResumeDevicesModal/MassResumeDevicesModal';
+import ResumeDevicesModal from '../modals/ResumeDevicesModal/ResumeDevicesModal';
+import { DeviceResumeRequest } from '@flightctl/types';
+
+export type ResumeMode = 'global' | 'device' | 'fleet';
+
+type ModalType = 'mass' | 'confirm';
+
+interface SuspendedDevicesAlertProps {
+  mode: ResumeMode;
+  suspendedCount?: number;
+  extraAction?: {
+    actionText: string;
+    title: React.ReactNode;
+    requestSelector: DeviceResumeRequest;
+  };
+  onResumeComplete?: VoidFunction;
+}
+
+const SuspendedDevicesAlert = ({
+  mode,
+  suspendedCount = 0,
+  extraAction,
+  onResumeComplete,
+}: SuspendedDevicesAlertProps) => {
+  const { t } = useTranslation();
+  const [isMassModalOpen, setIsMassModalOpen] = React.useState(false);
+  const [isConfirmModalOpen, setIsConfirmModalOpen] = React.useState(false);
+
+  const openResumeModal = React.useCallback((modalType: ModalType) => {
+    if (modalType === 'mass') {
+      setIsMassModalOpen(true);
+    } else {
+      setIsConfirmModalOpen(true);
+    }
+  }, []);
+
+  const closeResumeModal = React.useCallback(
+    (modalType: ModalType, hasResumed?: boolean) => {
+      if (hasResumed) {
+        onResumeComplete?.();
+      }
+      if (modalType === 'mass') {
+        setIsMassModalOpen(false);
+      } else {
+        setIsConfirmModalOpen(false);
+      }
+    },
+    [onResumeComplete],
+  );
+
+  const getMainMessage = () => {
+    const suspendedCountStr = suspendedCount.toString();
+    switch (mode) {
+      case 'device':
+        return t(
+          "This device is suspended because its local configuration is newer than the server's record. It will not receive updates until it is resumed.",
+        );
+      case 'fleet':
+        return (
+          <Trans t={t} count={suspendedCount}>
+            <strong>{suspendedCountStr}</strong> <strong>devices in this fleet</strong> are suspended because their
+            local configuration is newer than the server&apos;s record. These devices will not receive updates until
+            they are resumed.
+          </Trans>
+        );
+      default:
+        return (
+          <Trans t={t} count={suspendedCount}>
+            <strong>{suspendedCountStr}</strong> devices are suspended because their local configuration is newer than
+            the server&apos;s record. These devices will not receive updates until they are resumed.
+          </Trans>
+        );
+    }
+  };
+
+  const getActions = () => {
+    const actionButtons: React.ReactElement[] = [];
+
+    if (extraAction) {
+      actionButtons.push(
+        <AlertActionLink key="extra-resume-action" onClick={() => openResumeModal('confirm')}>
+          {extraAction.actionText}
+        </AlertActionLink>,
+      );
+    }
+
+    actionButtons.push(
+      <AlertActionLink key="resume-suspended-devices" onClick={() => openResumeModal('mass')}>
+        {t('Resume suspended devices')}
+      </AlertActionLink>,
+    );
+
+    return actionButtons;
+  };
+
+  return (
+    <>
+      <Alert variant="danger" isInline title={t('Suspended devices detected')} actionLinks={getActions()}>
+        <Stack hasGutter>
+          <StackItem>{getMainMessage()}</StackItem>
+          <StackItem>
+            {mode === 'fleet' ? (
+              <Trans t={t}>
+                <strong>Warning:</strong> Please review this fleet&apos;s configuration before taking action. Resuming a
+                device will cause it to apply the current specification, which may be older than what is on the device.
+              </Trans>
+            ) : (
+              <Trans t={t}>
+                <strong>Warning:</strong> Please review device configurations before taking action. Resuming a device
+                will cause it to apply the current specification, which may be older than what is on the device.
+              </Trans>
+            )}
+          </StackItem>
+        </Stack>
+      </Alert>
+      {isMassModalOpen && (
+        <MassResumeDevicesModal
+          onClose={(hasResumed) => {
+            closeResumeModal('mass', hasResumed);
+          }}
+        />
+      )}
+      {isConfirmModalOpen && extraAction && (
+        <ResumeDevicesModal
+          mode={mode === 'global' ? 'device' : mode}
+          title={extraAction.title}
+          selector={extraAction.requestSelector}
+          expectedCount={suspendedCount}
+          onClose={(hasResumed) => {
+            closeResumeModal('confirm', hasResumed);
+          }}
+        />
+      )}
+    </>
+  );
+};
+
+export default SuspendedDevicesAlert;
diff --git a/libs/ui-components/src/components/SystemRestore/SystemRestoreBanners.css b/libs/ui-components/src/components/SystemRestore/SystemRestoreBanners.css
new file mode 100644
index 000000000..6aa5034a0
--- /dev/null
+++ b/libs/ui-components/src/components/SystemRestore/SystemRestoreBanners.css
@@ -0,0 +1,6 @@
+.fctl-system-restore-banners {
+  padding: 1rem 0;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
diff --git a/libs/ui-components/src/components/SystemRestore/SystemRestoreBanners.tsx b/libs/ui-components/src/components/SystemRestore/SystemRestoreBanners.tsx
new file mode 100644
index 000000000..593d1075d
--- /dev/null
+++ b/libs/ui-components/src/components/SystemRestore/SystemRestoreBanners.tsx
@@ -0,0 +1,82 @@
+import * as React from 'react';
+import { DeviceResumeRequest, DeviceSummaryStatusType, DevicesSummary } from '@flightctl/types';
+import { useSystemRestore } from '../../hooks/useSystemRestoreContext';
+import SuspendedDevicesAlert, { ResumeMode } from './SuspendedDevicesAlert';
+import { PendingSyncDevicesAlert } from './PendingSyncDevicesAlert';
+
+import './SystemRestoreBanners.css';
+
+interface SystemRestoreBannersProps {
+  mode: ResumeMode;
+  // Allows the banner to have an extra resume action for a subset of devices
+  resumeAction?: {
+    actionText: string;
+    title: React.ReactNode;
+    requestSelector: DeviceResumeRequest;
+  };
+  summaryStatus?: DevicesSummary['summaryStatus'];
+  onResumeComplete?: VoidFunction;
+  className?: string;
+}
+
+/**
+ * Uses the received devicesSummary to show the pending sync and suspended devices banners
+ */
+export const SystemRestoreBanners = ({
+  mode,
+  resumeAction,
+  summaryStatus,
+  onResumeComplete,
+  className,
+}: SystemRestoreBannersProps) => {
+  const pendingSyncCount = summaryStatus?.[DeviceSummaryStatusType.DeviceSummaryStatusAwaitingReconnect] || 0;
+  const suspendedCount = summaryStatus?.[DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused] || 0;
+
+  const showPendingSyncBanner = pendingSyncCount > 0;
+  const showSuspendedBanner = suspendedCount > 0;
+
+  if (!showPendingSyncBanner && !showSuspendedBanner) {
+    return null;
+  }
+
+  return (
+    <div className={`fctl-system-restore-banners ${className}`}>
+      {showPendingSyncBanner && <PendingSyncDevicesAlert forSingleDevice={mode === 'device'} />}
+
+      {showSuspendedBanner && (
+        <SuspendedDevicesAlert
+          mode={mode}
+          suspendedCount={suspendedCount}
+          extraAction={resumeAction}
+          onResumeComplete={onResumeComplete}
+        />
+      )}
+    </div>
+  );
+};
+
+/**
+ * Shows the banners related to device summary data based on all existing devices
+ */
+export const GlobalSystemRestoreBanners = ({
+  onResumeComplete,
+  className,
+}: {
+  onResumeComplete?: VoidFunction;
+  className?: string;
+}) => {
+  const { summaryStatus, isLoading } = useSystemRestore();
+
+  if (isLoading) {
+    return null;
+  }
+
+  return (
+    <SystemRestoreBanners
+      mode="global"
+      summaryStatus={summaryStatus}
+      onResumeComplete={onResumeComplete}
+      className={className}
+    />
+  );
+};
diff --git a/libs/ui-components/src/components/charts/utils.ts b/libs/ui-components/src/components/charts/utils.ts
index 1a4d1ac5e..e691f3865 100644
--- a/libs/ui-components/src/components/charts/utils.ts
+++ b/libs/ui-components/src/components/charts/utils.ts
@@ -27,7 +27,7 @@ export const toChartData = <T extends string>(
     return {
       x: `${statusItem.label}`,
       y: entryIndex === -1 ? 0 : percentages[entryIndex],
-      color: getDefaultStatusColor(statusItem.level),
+      color: statusItem.customColor || getDefaultStatusColor(statusItem.level),
       link: {
         to: ROUTE.DEVICES as Route,
         query: query.toString(),
diff --git a/libs/ui-components/src/components/form/FilterSelect.css b/libs/ui-components/src/components/form/FilterSelect.css
index 96ecc71c5..e2450a532 100644
--- a/libs/ui-components/src/components/form/FilterSelect.css
+++ b/libs/ui-components/src/components/form/FilterSelect.css
@@ -1,6 +1,5 @@
 .fctl-filter-select__group {
-    height: 18rem;
-    overflow: auto;
+  overflow: auto;
 }
 
 .fctl-toggle-content {
@@ -8,11 +7,11 @@
 }
 
 .fctl-toggle-content__badge {
-    margin-left: var(--pf-v5-global--spacer--sm);
+  margin-left: var(--pf-v5-global--spacer--sm);
 }
 
 .fctl-toggle-content__loader {
   position: absolute;
   top: 0;
   right: 2.5rem;
-}
\ No newline at end of file
+}
diff --git a/libs/ui-components/src/components/form/validations.ts b/libs/ui-components/src/components/form/validations.ts
index 01b2b7871..256b0e785 100644
--- a/libs/ui-components/src/components/form/validations.ts
+++ b/libs/ui-components/src/components/form/validations.ts
@@ -695,3 +695,17 @@ export const deviceApprovalValidationSchema = (t: TFunction, conf: { isSingleDev
         ),
     labels: validLabelsSchema(t, forbiddenDeviceLabels),
   });
+
+export const createMassResumeValidationSchema = (t: TFunction) =>
+  Yup.object().shape({
+    mode: Yup.string().oneOf(['fleet', 'labels', 'all']).required(),
+    fleetId: Yup.string().when('mode', ([mode]) =>
+      mode === 'fleet' ? Yup.string().required(t('Fleet selection is required')) : Yup.string(),
+    ),
+    labels: Yup.array().when('mode', ([mode]) => {
+      if (mode === 'labels') {
+        return validLabelsSchema(t).min(1, t('At least one label is required'));
+      }
+      return Yup.array();
+    }),
+  });
diff --git a/libs/ui-components/src/components/modals/ResumeDevicesModal/ResumeDevicesModal.tsx b/libs/ui-components/src/components/modals/ResumeDevicesModal/ResumeDevicesModal.tsx
new file mode 100644
index 000000000..5577f465a
--- /dev/null
+++ b/libs/ui-components/src/components/modals/ResumeDevicesModal/ResumeDevicesModal.tsx
@@ -0,0 +1,114 @@
+import * as React from 'react';
+import { Alert, Button, Modal, ModalVariant, Stack, StackItem, Text, TextContent } from '@patternfly/react-core';
+import { DeviceResumeRequest, DeviceResumeResponse } from '@flightctl/types';
+
+import { useTranslation } from '../../../hooks/useTranslation';
+import { useFetch } from '../../../hooks/useFetch';
+import { getErrorMessage } from '../../../utils/error';
+
+interface ResumeDeviceModalProps {
+  mode: 'device' | 'fleet';
+  title: React.ReactNode;
+  selector: DeviceResumeRequest;
+  expectedCount: number;
+  onClose: (hasResumed: boolean | undefined) => void;
+}
+
+/**
+ * Modal to resume an individual device, or all the devices in a fleet
+ */
+const ResumeDevicesModal = ({ mode, title, selector, expectedCount, onClose }: ResumeDeviceModalProps) => {
+  const { t } = useTranslation();
+  const { post } = useFetch();
+  const [resumedCount, setResumedCount] = React.useState<number | undefined>(undefined);
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
+  const [submitError, setSubmitError] = React.useState<string | undefined>(undefined);
+  const hasResumed = Boolean(resumedCount && resumedCount > 0);
+
+  const pluralCount = mode === 'device' ? 1 : 2; // Used to generate translations for one/multiple cases
+
+  const handleConfirm = async () => {
+    setIsSubmitting(true);
+    setSubmitError(undefined);
+
+    try {
+      const resumeResponse = await post<DeviceResumeRequest, DeviceResumeResponse>('deviceactions/resume', selector);
+      setResumedCount(resumeResponse.resumedDevices || 0);
+    } catch (error) {
+      setSubmitError(getErrorMessage(error));
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  return (
+    <Modal
+      variant={ModalVariant.small}
+      title={t('Resume devices?', { count: pluralCount })}
+      isOpen
+      onClose={() => onClose(hasResumed)}
+      actions={[
+        <Button
+          key="confirm"
+          variant="primary"
+          onClick={handleConfirm}
+          isLoading={isSubmitting}
+          isDisabled={isSubmitting || resumedCount !== undefined}
+        >
+          {mode === 'device' ? t('Resume') : t('Resume all')}
+        </Button>,
+        <Button key="cancel" variant="link" onClick={() => onClose(hasResumed)} isDisabled={isSubmitting}>
+          {hasResumed ? t('Close') : t('Cancel')}
+        </Button>,
+      ]}
+    >
+      <Stack hasGutter>
+        <StackItem>
+          <TextContent>
+            <Text>{title}</Text>
+          </TextContent>
+        </StackItem>
+
+        <StackItem>
+          <TextContent>
+            <Text>
+              {t(
+                "This action will resolve the configuration conflict and allow the devices to receive new updates from the server. This action is irreversible, please ensure the devices' assigned configuration is correct before proceeding.",
+                { count: pluralCount },
+              )}
+            </Text>
+          </TextContent>
+        </StackItem>
+
+        {submitError && (
+          <StackItem>
+            <Alert isInline variant="danger" title={t('Resuming devices failed', { count: pluralCount })}>
+              {submitError}
+            </Alert>
+          </StackItem>
+        )}
+
+        {resumedCount === expectedCount && (
+          <StackItem>
+            <Alert isInline variant="success" title={t('Resume successful')}>
+              {t('All {{ resumedCount }} devices resumed successfully', { resumedCount })}
+            </Alert>
+          </StackItem>
+        )}
+
+        {resumedCount !== undefined && resumedCount !== expectedCount && (
+          <StackItem>
+            <Alert isInline variant="warning" title={t('Resume with warnings')}>
+              {t('{{ expectedCount }} devices to resume, and {{ resumedCount }} resumed successfully', {
+                expectedCount,
+                resumedCount,
+              })}
+            </Alert>
+          </StackItem>
+        )}
+      </Stack>
+    </Modal>
+  );
+};
+
+export default ResumeDevicesModal;
diff --git a/libs/ui-components/src/components/modals/massModals/ResumeDevicesModal/MassResumeDevicesModal.tsx b/libs/ui-components/src/components/modals/massModals/ResumeDevicesModal/MassResumeDevicesModal.tsx
new file mode 100644
index 000000000..6f1ca724b
--- /dev/null
+++ b/libs/ui-components/src/components/modals/massModals/ResumeDevicesModal/MassResumeDevicesModal.tsx
@@ -0,0 +1,465 @@
+import * as React from 'react';
+import {
+  Alert,
+  Button,
+  FormGroup,
+  MenuToggle,
+  MenuToggleElement,
+  Modal,
+  ModalVariant,
+  Radio,
+  Select,
+  SelectList,
+  SelectOption,
+  Spinner,
+  Stack,
+  StackItem,
+  Text,
+  TextContent,
+} from '@patternfly/react-core';
+import { Trans } from 'react-i18next';
+import { Formik, useFormikContext } from 'formik';
+import { DeviceList, DeviceResumeRequest, DeviceResumeResponse, Fleet } from '@flightctl/types';
+
+import { FlightCtlLabel } from '../../../../types/extraTypes';
+import { useTranslation } from '../../../../hooks/useTranslation';
+import { useFetch } from '../../../../hooks/useFetch';
+import LabelsField from '../../../form/LabelsField';
+import FlightCtlForm from '../../../form/FlightCtlForm';
+import { createMassResumeValidationSchema } from '../../../form/validations';
+import { getErrorMessage } from '../../../../utils/error';
+import { commonQueries } from '../../../../utils/query';
+import { getApiListCount } from '../../../../utils/api';
+import { fromAPILabel, labelToExactApiMatchString } from '../../../../utils/labels';
+import { useFleets } from '../../../Fleet/useFleets';
+import ResumeAllDevicesConfirmationDialog from './ResumeAllDevicesConfirmationDialog';
+
+// Adds an artificial delay to make sure that the user notices the count is refreshing.
+// This is specially needed when users switch between modes, and the selection for the new mode is already valid.
+const showSpinnerBriefly = () => new Promise((resolve) => setTimeout(resolve, 450));
+
+type MassResumeFormValues = {
+  mode: SelectionMode;
+  fleetId: string;
+  labels: FlightCtlLabel[];
+};
+
+interface MassResumeDevicesModalProps {
+  onClose: (hasResumed?: boolean) => void;
+}
+
+enum SelectionMode {
+  FLEET = 'fleet',
+  LABELS = 'labels',
+  ALL = 'all',
+}
+
+const getSelectedFleetLabels = (fleets: Fleet[], fleetId: string) => {
+  const selectedFleet = fleets.find((fleet) => fleet.metadata.name === fleetId);
+  if (!selectedFleet) {
+    throw new Error('Selected fleet not found');
+  }
+  return fromAPILabel(selectedFleet.spec.selector?.matchLabels || {});
+};
+
+const MassResumeDevicesModalContent = ({ onClose }: MassResumeDevicesModalProps) => {
+  const { t } = useTranslation();
+  const { get, post } = useFetch();
+  const { values, setFieldValue, isValid, dirty } = useFormikContext<MassResumeFormValues>();
+
+  const { fleets, isLoading: fleetsLoading } = useFleets({});
+  const [isFleetListOpen, setIsFleetSelectOpen] = React.useState(false);
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
+  const [submitError, setSubmitError] = React.useState<string | undefined>(undefined);
+  const [showResumeAllConfirmation, setShowResumeAllConfirmation] = React.useState(false);
+
+  // Resume result state
+  const [resumedCount, setResumedCount] = React.useState<number | undefined>(undefined);
+
+  // Device count state
+  const [deviceCountNum, setDeviceCountNum] = React.useState<number>(0);
+  const [isCountLoading, setIsCountLoading] = React.useState(false);
+  const [countError, setCountError] = React.useState<string | null>(null);
+
+  const hasResumedAtLeastOne = resumedCount !== undefined && resumedCount > 0;
+  const hasResumedAllExpected = deviceCountNum > 0 && resumedCount === deviceCountNum;
+  const isSubmitEnabled =
+    (values.mode === SelectionMode.ALL || deviceCountNum > 0) &&
+    !isSubmitting &&
+    !isCountLoading &&
+    isValid &&
+    resumedCount === undefined;
+  const deviceCount = deviceCountNum.toString();
+
+  const loadMatchingDevicesCount = React.useCallback(
+    async (criteria: { fleetId?: string; labels?: FlightCtlLabel[]; all?: boolean }) => {
+      setIsCountLoading(true);
+      setCountError(null);
+      setDeviceCountNum(0);
+
+      try {
+        let queryEndpoint: string;
+
+        if (criteria.all) {
+          queryEndpoint = commonQueries.getAllSuspendedDevicesCount();
+        } else {
+          const fleetLabels = criteria.fleetId
+            ? getSelectedFleetLabels(fleets, criteria.fleetId)
+            : criteria.labels || [];
+          if (fleetLabels.length === 0) {
+            throw new Error('Invalid criteria: must provide either fleetId or labels');
+          }
+          queryEndpoint = commonQueries.getSuspendedDeviceCountByLabels(fleetLabels);
+        }
+
+        const deviceResult = await get<DeviceList>(queryEndpoint);
+        await showSpinnerBriefly();
+        setDeviceCountNum(getApiListCount(deviceResult) || 0);
+      } catch (error) {
+        await showSpinnerBriefly();
+        setCountError(t('Failed to obtain the number of matching devices'));
+      } finally {
+        setIsCountLoading(false);
+      }
+    },
+    [get, t, fleets],
+  );
+
+  const performResume = async () => {
+    setIsSubmitting(true);
+    setSubmitError(undefined);
+
+    try {
+      let labels: FlightCtlLabel[];
+
+      if (values.mode === SelectionMode.ALL) {
+        labels = [];
+      } else {
+        if (values.mode === SelectionMode.FLEET) {
+          labels = getSelectedFleetLabels(fleets, values.fleetId);
+        } else {
+          labels = values.labels;
+        }
+        // This shouldn't happen due to validations, but since an empty label selector would target all existing devices,
+        // wake sure the UI does't accidentally submit a request with an empty selector
+        const emptySelection = labels.every((label) => label.key === '');
+        if (labels.length === 0 || emptySelection) {
+          throw new Error('The current selection would target all devices.');
+        }
+      }
+
+      const resumeRequest: DeviceResumeRequest = {
+        labelSelector: labels.map((label) => labelToExactApiMatchString(label)).join(','),
+      };
+
+      const resumeResponse = await post<DeviceResumeRequest, DeviceResumeResponse>(
+        'deviceactions/resume',
+        resumeRequest,
+      );
+      setResumedCount(resumeResponse.resumedDevices || 0);
+    } catch (error) {
+      setSubmitError(getErrorMessage(error));
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const handleResume = () => {
+    if (values.mode === SelectionMode.ALL) {
+      setShowResumeAllConfirmation(true);
+    } else {
+      performResume();
+    }
+  };
+
+  const handleSelectionModeChanged = (mode: SelectionMode) => {
+    setFieldValue('mode', mode);
+
+    if (mode === SelectionMode.ALL) {
+      // Load count for all suspended devices
+      loadMatchingDevicesCount({ all: true });
+    } else if (mode === SelectionMode.FLEET && values.fleetId) {
+      // If switching to a mode that already had a valid selection, we refresh the count
+      loadMatchingDevicesCount({ fleetId: values.fleetId });
+    } else if (mode === SelectionMode.LABELS && values.labels.length > 0) {
+      loadMatchingDevicesCount({ labels: values.labels });
+    } else {
+      // Clear the count if there isn't a valid selection
+      setDeviceCountNum(0);
+      setCountError(null);
+      setIsCountLoading(false);
+    }
+  };
+
+  const handleFleetSelected = (fleetId: string) => {
+    setFieldValue('fleetId', fleetId);
+    setIsFleetSelectOpen(false);
+
+    if (fleetId) {
+      loadMatchingDevicesCount({ fleetId });
+    } else {
+      setDeviceCountNum(0);
+      setCountError(null);
+    }
+  };
+
+  const handleLabelsChanged = (newLabels: FlightCtlLabel[], hasErrors: boolean) => {
+    if (hasErrors || newLabels.length === 0) {
+      setDeviceCountNum(0);
+      setCountError(null);
+      return;
+    } else if (newLabels.length > 0) {
+      loadMatchingDevicesCount({ labels: newLabels });
+    }
+  };
+
+  return (
+    <Modal
+      variant={ModalVariant.medium}
+      title={t('Resume devices')}
+      isOpen
+      onClose={() => onClose(hasResumedAtLeastOne)}
+      actions={[
+        <Button
+          key="resume"
+          variant="primary"
+          onClick={handleResume}
+          isLoading={isSubmitting}
+          isDisabled={!isSubmitEnabled}
+        >
+          {t('Resume selection')}
+        </Button>,
+        <Button key="cancel" variant="link" onClick={() => onClose(hasResumedAtLeastOne)} isDisabled={isSubmitting}>
+          {hasResumedAtLeastOne ? t('Close') : t('Cancel')}
+        </Button>,
+      ]}
+    >
+      <Stack hasGutter>
+        <FlightCtlForm>
+          <StackItem>
+            <TextContent>
+              <Text>
+                {t(
+                  "Following a system restore, devices have been identified with configurations newer than the server's records. To prevent data loss, they have been suspended from receiving updates.",
+                )}
+              </Text>
+            </TextContent>
+          </StackItem>
+          <StackItem>
+            <TextContent>
+              <Text>{t('Choose the criteria to select the devices to resume')}:</Text>
+            </TextContent>
+          </StackItem>
+
+          <StackItem>
+            <FormGroup isRequired fieldId="selection-mode">
+              <Radio
+                label={t('Fleet')}
+                id="selectionModeFleet"
+                name="selectionMode"
+                isChecked={values.mode === SelectionMode.FLEET}
+                onChange={() => {
+                  handleSelectionModeChanged(SelectionMode.FLEET);
+                }}
+                description={t('Resume all suspended devices associated with a given fleet')}
+              />
+              <Radio
+                label={t('Labels')}
+                id="selectionModeLabels"
+                name="selectionMode"
+                isChecked={values.mode === SelectionMode.LABELS}
+                onChange={() => {
+                  handleSelectionModeChanged(SelectionMode.LABELS);
+                }}
+                description={t('Resume all suspended devices matching the specified labels')}
+              />
+              <Radio
+                label={t('All suspended devices')}
+                id="selectionModeAll"
+                name="selectionMode"
+                isChecked={values.mode === SelectionMode.ALL}
+                onChange={() => {
+                  handleSelectionModeChanged(SelectionMode.ALL);
+                }}
+                description={t('Resume all suspended devices')}
+              />
+            </FormGroup>
+          </StackItem>
+
+          {values.mode === SelectionMode.FLEET && (
+            <StackItem>
+              <FormGroup label={t('Fleet')} isRequired fieldId="fleetId">
+                <Select
+                  id="fleetSelection"
+                  isOpen={isFleetListOpen}
+                  selected={values.fleetId}
+                  onSelect={(_, selection) => handleFleetSelected(selection as string)}
+                  onOpenChange={(isOpen) => setIsFleetSelectOpen(isOpen)}
+                  toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
+                    <MenuToggle
+                      ref={toggleRef}
+                      onClick={() => setIsFleetSelectOpen(!isFleetListOpen)}
+                      isExpanded={isFleetListOpen}
+                      isDisabled={fleetsLoading}
+                      style={{ width: '100%' }}
+                    >
+                      {values.fleetId || t('Select a fleet')}
+                    </MenuToggle>
+                  )}
+                  shouldFocusToggleOnSelect
+                >
+                  <SelectList>
+                    {fleets.map((fleet) => {
+                      const fleetId = fleet.metadata.name || '';
+                      const deviceSelectorStr = Object.entries(fleet.spec?.selector?.matchLabels || {})
+                        .map(([key, value]) => (value ? `${key}=${value}` : key))
+                        .join(',');
+
+                      let description = '';
+                      if (deviceSelectorStr) {
+                        description = `${t('Device selector labels')}: ${deviceSelectorStr}`;
+                      } else {
+                        description = t('This fleet does not select any devices');
+                      }
+
+                      return (
+                        <SelectOption
+                          key={fleetId}
+                          value={fleetId}
+                          description={description}
+                          isDisabled={!deviceSelectorStr}
+                        >
+                          {fleetId}
+                        </SelectOption>
+                      );
+                    })}
+                  </SelectList>
+                </Select>
+              </FormGroup>
+            </StackItem>
+          )}
+
+          {values.mode === SelectionMode.LABELS && (
+            <StackItem>
+              <FormGroup label={t('Device labels')} fieldId="labelsSelection" isRequired>
+                <LabelsField name="labels" onChangeCallback={handleLabelsChanged} />
+              </FormGroup>
+            </StackItem>
+          )}
+        </FlightCtlForm>
+
+        {isValid && dirty && resumedCount === undefined && (
+          <StackItem>
+            {isCountLoading ? (
+              <Alert variant="info" isInline title={t('Refreshing device count')}>
+                <Spinner size="md" className="pf-v5-u-mr-sm" />
+                {t('Checking how many suspended devices match your criteria...')}
+              </Alert>
+            ) : countError ? (
+              <Alert variant="warning" isInline title={t('Unable to refresh device count')}>
+                {countError}
+              </Alert>
+            ) : deviceCountNum > 0 ? (
+              <Alert
+                variant={values.mode === SelectionMode.ALL ? 'warning' : 'success'}
+                isInline
+                title={t('Devices found')}
+              >
+                {values.mode === SelectionMode.FLEET ? (
+                  <Trans t={t}>
+                    <strong>{deviceCount}</strong> suspended devices are currently associated with fleet{' '}
+                    <strong>{values.fleetId}</strong>.
+                  </Trans>
+                ) : values.mode === SelectionMode.LABELS ? (
+                  <Trans t={t}>
+                    <strong>{deviceCount}</strong> suspended devices match the specified labels.
+                  </Trans>
+                ) : (
+                  <>
+                    <Trans t={t} count={deviceCountNum}>
+                      You are about to resume all <strong>{deviceCount}</strong> suspended devices.
+                    </Trans>
+                    {t(
+                      'This action is irreversible and will allow all affected devices to receive new configuration updates from the server.',
+                    )}
+                  </>
+                )}
+              </Alert>
+            ) : (
+              <Alert variant="warning" isInline title={t('No devices found')}>
+                {values.mode === SelectionMode.FLEET ? (
+                  <Trans t={t}>
+                    No suspended devices are associated with fleet <strong>{values.fleetId}</strong>.
+                  </Trans>
+                ) : values.mode === SelectionMode.ALL ? (
+                  t('No suspended devices found.')
+                ) : (
+                  t('No suspended devices match the specified labels.')
+                )}
+              </Alert>
+            )}
+          </StackItem>
+        )}
+
+        {submitError && (
+          <StackItem>
+            <Alert isInline variant="danger" title={t('Resume devices failed')}>
+              {submitError}
+            </Alert>
+          </StackItem>
+        )}
+        {resumedCount !== undefined && hasResumedAllExpected && (
+          <StackItem>
+            <Alert isInline variant="success" title={t('Resume successful')}>
+              {t('{{ resumedCount }} devices were resumed', { resumedCount })}
+            </Alert>
+          </StackItem>
+        )}
+
+        {resumedCount !== undefined && !hasResumedAllExpected && (
+          <StackItem>
+            <Alert isInline variant="warning" title={t('Resumed with warnings')}>
+              {t('{{ expectedCount }} devices to resume, and {{ resumedCount }} resumed successfully', {
+                expectedCount: deviceCountNum,
+                resumedCount,
+              })}
+            </Alert>
+          </StackItem>
+        )}
+      </Stack>
+      {showResumeAllConfirmation && (
+        <ResumeAllDevicesConfirmationDialog
+          deviceCountNum={deviceCountNum}
+          onClose={(doConfirm) => {
+            setShowResumeAllConfirmation(false);
+            if (doConfirm) {
+              performResume();
+            }
+          }}
+        />
+      )}
+    </Modal>
+  );
+};
+
+const MassResumeDevicesModal = ({ onClose }: MassResumeDevicesModalProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <Formik<MassResumeFormValues>
+      initialValues={{
+        mode: SelectionMode.FLEET,
+        fleetId: '',
+        labels: [],
+      }}
+      validationSchema={createMassResumeValidationSchema(t)}
+      onSubmit={() => {
+        // This will be handled by the inner component
+      }}
+    >
+      <MassResumeDevicesModalContent onClose={onClose} />
+    </Formik>
+  );
+};
+
+export default MassResumeDevicesModal;
diff --git a/libs/ui-components/src/components/modals/massModals/ResumeDevicesModal/ResumeAllDevicesConfirmationDialog.tsx b/libs/ui-components/src/components/modals/massModals/ResumeDevicesModal/ResumeAllDevicesConfirmationDialog.tsx
new file mode 100644
index 000000000..e71130372
--- /dev/null
+++ b/libs/ui-components/src/components/modals/massModals/ResumeDevicesModal/ResumeAllDevicesConfirmationDialog.tsx
@@ -0,0 +1,55 @@
+import * as React from 'react';
+import { Button, Modal, ModalVariant, Stack, StackItem, Text, TextContent } from '@patternfly/react-core';
+import { Trans } from 'react-i18next';
+
+import { useTranslation } from '../../../../hooks/useTranslation';
+
+interface ResumeAllDevicesConfirmationModalProps {
+  deviceCountNum: number;
+  onClose: (doConfirm: boolean) => void;
+  isSubmitting?: boolean;
+}
+
+const ResumeAllDevicesConfirmationModal = ({ deviceCountNum, onClose }: ResumeAllDevicesConfirmationModalProps) => {
+  const { t } = useTranslation();
+
+  const deviceCount = deviceCountNum.toString();
+
+  return (
+    <Modal
+      variant={ModalVariant.small}
+      title={t('Resume all {{ deviceCount }} devices?', { deviceCount })}
+      isOpen
+      onClose={() => onClose(false)}
+      actions={[
+        <Button key="confirm" variant="primary" onClick={() => onClose(true)}>
+          {t('Resume all devices')}
+        </Button>,
+        <Button key="cancel" variant="link" onClick={() => onClose(false)}>
+          {t('Cancel')}
+        </Button>,
+      ]}
+    >
+      <Stack hasGutter>
+        <StackItem>
+          <TextContent>
+            <Text>
+              <Trans t={t} count={deviceCountNum}>
+                You are about to resume all <strong>{deviceCount}</strong> suspended devices.
+              </Trans>
+            </Text>
+          </TextContent>
+          <TextContent>
+            <Text>
+              {t(
+                'This action is irreversible and will allow all affected devices to receive new configuration updates from the server.',
+              )}
+            </Text>
+          </TextContent>
+        </StackItem>
+      </Stack>
+    </Modal>
+  );
+};
+
+export default ResumeAllDevicesConfirmationModal;
diff --git a/libs/ui-components/src/hooks/useAccessReview.ts b/libs/ui-components/src/hooks/useAccessReview.ts
index 26b7eeeea..b804f3a1d 100644
--- a/libs/ui-components/src/hooks/useAccessReview.ts
+++ b/libs/ui-components/src/hooks/useAccessReview.ts
@@ -14,19 +14,35 @@ export const useAccessReview = (kind: RESOURCE, verb: VERB): AccessReviewResult
     fetch: { checkPermissions },
   } = useAppContext();
   React.useEffect(() => {
+    let isMounted = true;
+
     const doItAsync = async () => {
+      if (!isMounted) return;
+
       setIsLoading(true);
       try {
         const allowed = await checkPermissions(kind, verb);
-        setIsAllowed(allowed);
+        if (isMounted) {
+          setIsAllowed(allowed);
+        }
       } catch (err) {
-        setError(getErrorMessage(err));
-        setIsAllowed(false);
+        if (isMounted) {
+          setError(getErrorMessage(err));
+          setIsAllowed(false);
+        }
       } finally {
-        setIsLoading(false);
+        if (isMounted) {
+          setIsLoading(false);
+        }
       }
     };
+
     doItAsync();
+
+    // Cleanup function to prevent state updates after unmount
+    return () => {
+      isMounted = false;
+    };
   }, [kind, verb, checkPermissions]);
 
   return [isAllowed, isLoading, error];
diff --git a/libs/ui-components/src/hooks/useAppContext.tsx b/libs/ui-components/src/hooks/useAppContext.tsx
index 7c5b0f753..0f6691054 100644
--- a/libs/ui-components/src/hooks/useAppContext.tsx
+++ b/libs/ui-components/src/hooks/useAppContext.tsx
@@ -71,8 +71,12 @@ export type AppContextProps = {
   fetch: {
     getWsEndpoint: (deviceId: string) => string;
     get: <R>(kind: string, abortSignal?: AbortSignal) => Promise<R>;
-    post: <R>(kind: string, data: R, abortSignal?: AbortSignal) => Promise<R>;
-    put: <R>(kind: string, data: R, abortSignal?: AbortSignal) => Promise<R>;
+    post: <TRequest, TResponse = TRequest>(
+      kind: string,
+      data: TRequest,
+      abortSignal?: AbortSignal,
+    ) => Promise<TResponse>;
+    put: <TRequest>(kind: string, data: TRequest, abortSignal?: AbortSignal) => Promise<TRequest>;
     remove: <R>(kind: string, abortSignal?: AbortSignal) => Promise<R>;
     patch: <R>(kind: string, patches: PatchRequest, abortSignal?: AbortSignal) => Promise<R>;
     checkPermissions: (resource: RESOURCE, verb: VERB) => Promise<boolean>;
diff --git a/libs/ui-components/src/hooks/useSystemRestoreContext.tsx b/libs/ui-components/src/hooks/useSystemRestoreContext.tsx
new file mode 100644
index 000000000..d6946ec5b
--- /dev/null
+++ b/libs/ui-components/src/hooks/useSystemRestoreContext.tsx
@@ -0,0 +1,54 @@
+import * as React from 'react';
+import { DeviceSummaryStatusType, DevicesSummary } from '@flightctl/types';
+import { useDevicesSummary } from '../components/Device/DevicesPage/useDevices';
+import { useAccessReview } from './useAccessReview';
+import { RESOURCE, VERB } from '../types/rbac';
+
+interface SystemRestoreContextData {
+  summaryStatus: DevicesSummary['summaryStatus'] | undefined;
+  isLoading: boolean;
+  pendingSyncCount: number;
+  suspendedCount: number;
+}
+
+const SystemRestoreContext = React.createContext<SystemRestoreContextData | undefined>(undefined);
+
+/**
+ * Provider that fetches global (unfiltered) devices summary for system restore alerts.
+ * This provides data needed for showing consistent restore banners across all pages.
+ */
+export const SystemRestoreProvider = ({ children }: React.PropsWithChildren) => {
+  const [canListDevices] = useAccessReview(RESOURCE.DEVICE, VERB.LIST);
+
+  // We obtain the unfiltered device summary to detect if any devices are in system restore statuses
+  const [devicesSummary, isLoading] = useDevicesSummary({});
+
+  const contextValue = React.useMemo(() => {
+    const pendingSyncCount = canListDevices
+      ? devicesSummary?.summaryStatus?.[DeviceSummaryStatusType.DeviceSummaryStatusAwaitingReconnect] || 0
+      : 0;
+
+    const suspendedCount = canListDevices
+      ? devicesSummary?.summaryStatus?.[DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused] || 0
+      : 0;
+
+    return {
+      summaryStatus: canListDevices ? devicesSummary?.summaryStatus : undefined,
+      isLoading: canListDevices ? isLoading : false,
+      pendingSyncCount,
+      suspendedCount,
+    };
+  }, [devicesSummary, isLoading, canListDevices]);
+
+  return <SystemRestoreContext.Provider value={contextValue}>{children}</SystemRestoreContext.Provider>;
+};
+
+export const useSystemRestore = (): SystemRestoreContextData => {
+  const context = React.useContext(SystemRestoreContext);
+
+  if (context === undefined) {
+    throw new Error('useSystemRestore must be used within a SystemRestoreProvider');
+  }
+
+  return context;
+};
diff --git a/libs/ui-components/src/types/rbac.ts b/libs/ui-components/src/types/rbac.ts
index 9dbd958a4..7e9352e82 100644
--- a/libs/ui-components/src/types/rbac.ts
+++ b/libs/ui-components/src/types/rbac.ts
@@ -13,6 +13,7 @@ export enum RESOURCE {
   DEVICE = 'devices',
   DEVICE_CONSOLE = 'devices/console',
   DEVICE_DECOMMISSION = 'devices/decommission',
+  DEVICE_RESUME = 'devices/resume',
   REPOSITORY = 'repositories',
   RESOURCE_SYNC = 'resourcesyncs',
   ENROLLMENT_REQUEST = 'enrollmentrequests',
diff --git a/libs/ui-components/src/utils/devices.ts b/libs/ui-components/src/utils/devices.ts
index db6deeebc..ef5dace25 100644
--- a/libs/ui-components/src/utils/devices.ts
+++ b/libs/ui-components/src/utils/devices.ts
@@ -1,4 +1,4 @@
-import { Device, ObjectMeta } from '@flightctl/types';
+import { Device, DeviceSummaryStatusType, ObjectMeta } from '@flightctl/types';
 import { TFunction } from 'react-i18next';
 
 const deviceFleetRegExp = /^Fleet\/(?<fleetName>.*)$/;
@@ -26,3 +26,13 @@ export const getDecommissionDisabledReason = (device: Device, t: TFunction) => {
   }
   return undefined;
 };
+
+export const isDeviceResumable = (device: Device) =>
+  device.status?.summary.status === DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused;
+
+export const getResumeDisabledReason = (device: Device, t: TFunction) => {
+  if (!isDeviceResumable(device)) {
+    return t('Device is not suspended.');
+  }
+  return undefined;
+};
diff --git a/libs/ui-components/src/utils/query.ts b/libs/ui-components/src/utils/query.ts
index a9dffac89..6567d5b9a 100644
--- a/libs/ui-components/src/utils/query.ts
+++ b/libs/ui-components/src/utils/query.ts
@@ -1,5 +1,6 @@
 import { FlightCtlLabel } from '../types/extraTypes';
 import { labelToExactApiMatchString, textToPartialApiMatchString } from './labels';
+import { DeviceSummaryStatusType } from '@flightctl/types';
 
 const addQueryConditions = (fieldSelectors: string[], fieldSelector: string, values?: string[]) => {
   if (values?.length === 1) {
@@ -74,6 +75,27 @@ export const commonQueries = {
     return `resourcesyncs?${searchParams.toString()}`;
   },
   getRepositoryById: (repositoryId: string) => `repositories/${repositoryId}`,
+  getSuspendedDeviceCountByLabels: (labels: FlightCtlLabel[]) => {
+    const searchParams = new URLSearchParams({
+      limit: '1',
+    });
+    searchParams.set('labelSelector', labels.map(labelToExactApiMatchString).join(','));
+    searchParams.set(
+      'fieldSelector',
+      `status.summary.status=${DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused}`,
+    );
+    return `devices?${searchParams.toString()}`;
+  },
+  getAllSuspendedDevicesCount: () => {
+    const searchParams = new URLSearchParams({
+      limit: '1',
+    });
+    searchParams.set(
+      'fieldSelector',
+      `status.summary.status=${DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused}`,
+    );
+    return `devices?${searchParams.toString()}`;
+  },
 };
 
 export { addQueryConditions, addTextContainsCondition, setLabelParams };
diff --git a/libs/ui-components/src/utils/status/common.ts b/libs/ui-components/src/utils/status/common.ts
index 019d881d5..694c6372d 100644
--- a/libs/ui-components/src/utils/status/common.ts
+++ b/libs/ui-components/src/utils/status/common.ts
@@ -20,6 +20,7 @@ export interface StatusItem<T extends string> {
   label: string;
   level: StatusLevel;
   customIcon?: React.ComponentClass<SVGIconProps>;
+  customColor?: string;
 }
 
 export const getDefaultStatusIcon = (level: StatusLevel) => {
diff --git a/libs/ui-components/src/utils/status/devices.ts b/libs/ui-components/src/utils/status/devices.ts
index 38763f845..ab65b26db 100644
--- a/libs/ui-components/src/utils/status/devices.ts
+++ b/libs/ui-components/src/utils/status/devices.ts
@@ -1,8 +1,10 @@
 import { TFunction } from 'react-i18next';
-import { DisconnectedIcon } from '@patternfly/react-icons/dist/js/icons/disconnected-icon';
 import { PowerOffIcon } from '@patternfly/react-icons/dist/js/icons/power-off-icon';
 import { PauseCircleIcon } from '@patternfly/react-icons/dist/js/icons/pause-circle-icon';
 import { BanIcon } from '@patternfly/react-icons/dist/js/icons/ban-icon';
+import { PendingIcon } from '@patternfly/react-icons/dist/js/icons/pending-icon';
+import suspendedColor from '@patternfly/react-tokens/dist/js/global_palette_orange_300';
+import pendingSyncColor from '@patternfly/react-tokens/dist/js/global_palette_blue_300';
 
 import {
   ApplicationsSummaryStatusType,
@@ -58,18 +60,6 @@ export const getDeviceStatusItems = (t: TFunction): StatusItem<DeviceSummaryStat
     label: t('Degraded'),
     level: 'warning',
   },
-  {
-    id: DeviceSummaryStatusType.DeviceSummaryStatusAwaitingReconnect,
-    label: t('Awaiting reconnect'),
-    level: 'warning',
-    customIcon: DisconnectedIcon,
-  },
-  {
-    id: DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused,
-    label: t('Updates paused'),
-    level: 'warning',
-    customIcon: PauseCircleIcon,
-  },
   {
     id: DeviceSummaryStatusType.DeviceSummaryStatusUnknown,
     label: t('Unknown'),
@@ -91,8 +81,51 @@ export const getDeviceStatusItems = (t: TFunction): StatusItem<DeviceSummaryStat
     label: t('Online'),
     level: 'success',
   },
+  {
+    id: DeviceSummaryStatusType.DeviceSummaryStatusAwaitingReconnect,
+    label: t('Pending sync'),
+    level: 'info',
+    customIcon: PendingIcon,
+    customColor: pendingSyncColor.value,
+  },
+  {
+    id: DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused,
+    label: t('Suspended'),
+    level: 'custom',
+    customIcon: PauseCircleIcon,
+    customColor: suspendedColor.value,
+  },
 ];
 
+/**
+ * Returns device status items for the Overview page, allowing to exclude statuses.
+ * If "AwaitingReconnect" or "ConflictPaused" statuses are present, they are ordered at the beginning
+ */
+export const getOverviewDeviceStatusItems = (
+  t: TFunction,
+  excludeStatuses?: DeviceSummaryStatusType[],
+): StatusItem<DeviceSummaryStatusType>[] => {
+  const allStatusItems = getDeviceStatusItems(t);
+
+  const filteredItems = excludeStatuses
+    ? allStatusItems.filter((item) => !excludeStatuses.includes(item.id))
+    : allStatusItems;
+
+  const priorityStatuses = [
+    DeviceSummaryStatusType.DeviceSummaryStatusAwaitingReconnect,
+    DeviceSummaryStatusType.DeviceSummaryStatusConflictPaused,
+  ];
+
+  const priorityItems = filteredItems.filter((item) => priorityStatuses.includes(item.id));
+  const otherItems = filteredItems.filter((item) => !priorityStatuses.includes(item.id));
+
+  const orderedPriorityItems = priorityStatuses
+    .map((status) => priorityItems.find((item) => item.id === status))
+    .filter(Boolean) as StatusItem<DeviceSummaryStatusType>[];
+
+  return [...orderedPriorityItems, ...otherItems];
+};
+
 export const getDeviceLifecycleStatusItems = (t: TFunction): StatusItem<DeviceLifecycleStatusType>[] => [
   {
     id: DeviceLifecycleStatusType.DeviceLifecycleStatusDecommissioned,