diff --git a/next.config.js b/next.config.js
index 38fd18091..028c0dc17 100644
--- a/next.config.js
+++ b/next.config.js
@@ -92,7 +92,7 @@ const config = {
     proxyTimeout: 1000 * 60 * 10,
     esmExternals: "loose"
   },
-  transpilePackages: ["monaco-editor", "@flanksource/icons"]
+  transpilePackages: ["monaco-editor"]
 };
 
 module.exports = withBundleAnalyzer(config);
diff --git a/package-lock.json b/package-lock.json
index b6e8b2fc3..b9ad1775e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "@flanksource/flanksource-ui",
-      "version": "1.0.800",
+      "version": "1.0.810",
       "dependencies": {
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@clerk/nextjs": "^5.3.0",
@@ -77,7 +77,8 @@
         "react-dom": "^18.2.0",
         "react-hook-form": "^7.15.0",
         "react-hot-toast": "^2.2.0",
-        "react-icons": "^4.11.0",
+        "react-icons": "^4.12.0",
+        "react-icons-v5": "npm:react-icons@^5.0.0",
         "react-image": "^4.1.0",
         "react-loading-icons": "^1.0.8",
         "react-mentions": "^4.4.0",
@@ -35499,6 +35500,15 @@
         "react": "*"
       }
     },
+    "node_modules/react-icons-v5": {
+      "name": "react-icons",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.3.0.tgz",
+      "integrity": "sha512-DnUk8aFbTyQPSkCfF8dbX6kQjXA9DktMeJqfjrg6cK9vwQVMxmcA3BfP4QoiztVmEHtwlTgLFsPuH2NskKT6eg==",
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
     "node_modules/react-image": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/react-image/-/react-image-4.1.0.tgz",
diff --git a/package.json b/package.json
index 2a84b144f..04f7cc62c 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,8 @@
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.15.0",
     "react-hot-toast": "^2.2.0",
-    "react-icons": "^4.11.0",
+    "react-icons": "^4.12.0",
+    "react-icons-v5": "npm:react-icons@^5.0.0",
     "react-image": "^4.1.0",
     "react-loading-icons": "^1.0.8",
     "react-mentions": "^4.4.0",
@@ -221,4 +222,4 @@
   "msw": {
     "workerDirectory": "public"
   }
-}
+}
\ No newline at end of file
diff --git a/public/mockServiceWorker.js b/public/mockServiceWorker.js
index f7c6e5f52..51d85eeeb 100644
--- a/public/mockServiceWorker.js
+++ b/public/mockServiceWorker.js
@@ -8,121 +8,121 @@
  * - Please do NOT serve this file on production.
  */
 
-const INTEGRITY_CHECKSUM = "3d6b9f06410d179a7f7404d4bf4c3c70";
-const activeClientIds = new Set();
+const INTEGRITY_CHECKSUM = '3d6b9f06410d179a7f7404d4bf4c3c70'
+const activeClientIds = new Set()
 
-self.addEventListener("install", function () {
-  self.skipWaiting();
-});
+self.addEventListener('install', function () {
+  self.skipWaiting()
+})
 
-self.addEventListener("activate", function (event) {
-  event.waitUntil(self.clients.claim());
-});
+self.addEventListener('activate', function (event) {
+  event.waitUntil(self.clients.claim())
+})
 
-self.addEventListener("message", async function (event) {
-  const clientId = event.source.id;
+self.addEventListener('message', async function (event) {
+  const clientId = event.source.id
 
   if (!clientId || !self.clients) {
-    return;
+    return
   }
 
-  const client = await self.clients.get(clientId);
+  const client = await self.clients.get(clientId)
 
   if (!client) {
-    return;
+    return
   }
 
   const allClients = await self.clients.matchAll({
-    type: "window"
-  });
+    type: 'window',
+  })
 
   switch (event.data) {
-    case "KEEPALIVE_REQUEST": {
+    case 'KEEPALIVE_REQUEST': {
       sendToClient(client, {
-        type: "KEEPALIVE_RESPONSE"
-      });
-      break;
+        type: 'KEEPALIVE_RESPONSE',
+      })
+      break
     }
 
-    case "INTEGRITY_CHECK_REQUEST": {
+    case 'INTEGRITY_CHECK_REQUEST': {
       sendToClient(client, {
-        type: "INTEGRITY_CHECK_RESPONSE",
-        payload: INTEGRITY_CHECKSUM
-      });
-      break;
+        type: 'INTEGRITY_CHECK_RESPONSE',
+        payload: INTEGRITY_CHECKSUM,
+      })
+      break
     }
 
-    case "MOCK_ACTIVATE": {
-      activeClientIds.add(clientId);
+    case 'MOCK_ACTIVATE': {
+      activeClientIds.add(clientId)
 
       sendToClient(client, {
-        type: "MOCKING_ENABLED",
-        payload: true
-      });
-      break;
+        type: 'MOCKING_ENABLED',
+        payload: true,
+      })
+      break
     }
 
-    case "MOCK_DEACTIVATE": {
-      activeClientIds.delete(clientId);
-      break;
+    case 'MOCK_DEACTIVATE': {
+      activeClientIds.delete(clientId)
+      break
     }
 
-    case "CLIENT_CLOSED": {
-      activeClientIds.delete(clientId);
+    case 'CLIENT_CLOSED': {
+      activeClientIds.delete(clientId)
 
       const remainingClients = allClients.filter((client) => {
-        return client.id !== clientId;
-      });
+        return client.id !== clientId
+      })
 
       // Unregister itself when there are no more clients
       if (remainingClients.length === 0) {
-        self.registration.unregister();
+        self.registration.unregister()
       }
 
-      break;
+      break
     }
   }
-});
+})
 
-self.addEventListener("fetch", function (event) {
-  const { request } = event;
-  const accept = request.headers.get("accept") || "";
+self.addEventListener('fetch', function (event) {
+  const { request } = event
+  const accept = request.headers.get('accept') || ''
 
   // Bypass server-sent events.
-  if (accept.includes("text/event-stream")) {
-    return;
+  if (accept.includes('text/event-stream')) {
+    return
   }
 
   // Bypass navigation requests.
-  if (request.mode === "navigate") {
-    return;
+  if (request.mode === 'navigate') {
+    return
   }
 
   // Opening the DevTools triggers the "only-if-cached" request
   // that cannot be handled by the worker. Bypass such requests.
-  if (request.cache === "only-if-cached" && request.mode !== "same-origin") {
-    return;
+  if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
+    return
   }
 
   // Bypass all requests when there are no active clients.
   // Prevents the self-unregistered worked from handling requests
   // after it's been deleted (still remains active until the next reload).
   if (activeClientIds.size === 0) {
-    return;
+    return
   }
 
   // Generate unique request ID.
-  const requestId = Math.random().toString(16).slice(2);
+  const requestId = Math.random().toString(16).slice(2)
 
   event.respondWith(
     handleRequest(event, requestId).catch((error) => {
-      if (error.name === "NetworkError") {
+      if (error.name === 'NetworkError') {
         console.warn(
           '[MSW] Successfully emulated a network error for the "%s %s" request.',
           request.method,
-          request.url
-        );
-        return;
+          request.url,
+        )
+        return
       }
 
       // At this point, any exception indicates an issue with the original request/response.
@@ -131,24 +131,24 @@ self.addEventListener("fetch", function (event) {
 [MSW] Caught an exception from the "%s %s" request (%s). This is probably not a problem with Mock Service Worker. There is likely an additional logging output above.`,
         request.method,
         request.url,
-        `${error.name}: ${error.message}`
-      );
-    })
-  );
-});
+        `${error.name}: ${error.message}`,
+      )
+    }),
+  )
+})
 
 async function handleRequest(event, requestId) {
-  const client = await resolveMainClient(event);
-  const response = await getResponse(event, client, requestId);
+  const client = await resolveMainClient(event)
+  const response = await getResponse(event, client, requestId)
 
   // Send back the response clone for the "response:*" life-cycle events.
   // Ensure MSW is active and ready to handle the message, otherwise
   // this message will pend indefinitely.
   if (client && activeClientIds.has(client.id)) {
-    (async function () {
-      const clonedResponse = response.clone();
+    ;(async function () {
+      const clonedResponse = response.clone()
       sendToClient(client, {
-        type: "RESPONSE",
+        type: 'RESPONSE',
         payload: {
           requestId,
           type: clonedResponse.type,
@@ -158,13 +158,13 @@ async function handleRequest(event, requestId) {
           body:
             clonedResponse.body === null ? null : await clonedResponse.text(),
           headers: Object.fromEntries(clonedResponse.headers.entries()),
-          redirected: clonedResponse.redirected
-        }
-      });
-    })();
+          redirected: clonedResponse.redirected,
+        },
+      })
+    })()
   }
 
-  return response;
+  return response
 }
 
 // Resolve the main client for the given event.
@@ -172,49 +172,49 @@ async function handleRequest(event, requestId) {
 // that registered the worker. It's with the latter the worker should
 // communicate with during the response resolving phase.
 async function resolveMainClient(event) {
-  const client = await self.clients.get(event.clientId);
+  const client = await self.clients.get(event.clientId)
 
-  if (client?.frameType === "top-level") {
-    return client;
+  if (client?.frameType === 'top-level') {
+    return client
   }
 
   const allClients = await self.clients.matchAll({
-    type: "window"
-  });
+    type: 'window',
+  })
 
   return allClients
     .filter((client) => {
       // Get only those clients that are currently visible.
-      return client.visibilityState === "visible";
+      return client.visibilityState === 'visible'
     })
     .find((client) => {
       // Find the client ID that's recorded in the
       // set of clients that have registered the worker.
-      return activeClientIds.has(client.id);
-    });
+      return activeClientIds.has(client.id)
+    })
 }
 
 async function getResponse(event, client, requestId) {
-  const { request } = event;
-  const clonedRequest = request.clone();
+  const { request } = event
+  const clonedRequest = request.clone()
 
   function passthrough() {
     // Clone the request because it might've been already used
     // (i.e. its body has been read and sent to the client).
-    const headers = Object.fromEntries(clonedRequest.headers.entries());
+    const headers = Object.fromEntries(clonedRequest.headers.entries())
 
     // Remove MSW-specific request headers so the bypassed requests
     // comply with the server's CORS preflight check.
     // Operate with the headers as an object because request "Headers"
     // are immutable.
-    delete headers["x-msw-bypass"];
+    delete headers['x-msw-bypass']
 
-    return fetch(clonedRequest, { headers });
+    return fetch(clonedRequest, { headers })
   }
 
   // Bypass mocking when the client is not active.
   if (!client) {
-    return passthrough();
+    return passthrough()
   }
 
   // Bypass initial page load requests (i.e. static assets).
@@ -222,18 +222,18 @@ async function getResponse(event, client, requestId) {
   // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
   // and is not ready to handle requests.
   if (!activeClientIds.has(client.id)) {
-    return passthrough();
+    return passthrough()
   }
 
   // Bypass requests with the explicit bypass header.
   // Such requests can be issued by "ctx.fetch()".
-  if (request.headers.get("x-msw-bypass") === "true") {
-    return passthrough();
+  if (request.headers.get('x-msw-bypass') === 'true') {
+    return passthrough()
   }
 
   // Notify the client that a request has been intercepted.
   const clientMessage = await sendToClient(client, {
-    type: "REQUEST",
+    type: 'REQUEST',
     payload: {
       id: requestId,
       url: request.url,
@@ -249,55 +249,55 @@ async function getResponse(event, client, requestId) {
       referrerPolicy: request.referrerPolicy,
       body: await request.text(),
       bodyUsed: request.bodyUsed,
-      keepalive: request.keepalive
-    }
-  });
+      keepalive: request.keepalive,
+    },
+  })
 
   switch (clientMessage.type) {
-    case "MOCK_RESPONSE": {
-      return respondWithMock(clientMessage.data);
+    case 'MOCK_RESPONSE': {
+      return respondWithMock(clientMessage.data)
     }
 
-    case "MOCK_NOT_FOUND": {
-      return passthrough();
+    case 'MOCK_NOT_FOUND': {
+      return passthrough()
     }
 
-    case "NETWORK_ERROR": {
-      const { name, message } = clientMessage.data;
-      const networkError = new Error(message);
-      networkError.name = name;
+    case 'NETWORK_ERROR': {
+      const { name, message } = clientMessage.data
+      const networkError = new Error(message)
+      networkError.name = name
 
       // Rejecting a "respondWith" promise emulates a network error.
-      throw networkError;
+      throw networkError
     }
   }
 
-  return passthrough();
+  return passthrough()
 }
 
 function sendToClient(client, message) {
   return new Promise((resolve, reject) => {
-    const channel = new MessageChannel();
+    const channel = new MessageChannel()
 
     channel.port1.onmessage = (event) => {
       if (event.data && event.data.error) {
-        return reject(event.data.error);
+        return reject(event.data.error)
       }
 
-      resolve(event.data);
-    };
+      resolve(event.data)
+    }
 
-    client.postMessage(message, [channel.port2]);
-  });
+    client.postMessage(message, [channel.port2])
+  })
 }
 
 function sleep(timeMs) {
   return new Promise((resolve) => {
-    setTimeout(resolve, timeMs);
-  });
+    setTimeout(resolve, timeMs)
+  })
 }
 
 async function respondWithMock(response) {
-  await sleep(response.delay);
-  return new Response(response.body, response);
+  await sleep(response.delay)
+  return new Response(response.body, response)
 }
diff --git a/src/components/Playbooks/Runs/Actions/PlaybookRunsActions.tsx b/src/components/Playbooks/Runs/Actions/PlaybookRunsActions.tsx
index 0aadcf24c..01f4e7c40 100644
--- a/src/components/Playbooks/Runs/Actions/PlaybookRunsActions.tsx
+++ b/src/components/Playbooks/Runs/Actions/PlaybookRunsActions.tsx
@@ -10,6 +10,7 @@ import dayjs from "dayjs";
 import { useMemo, useState } from "react";
 import { Link } from "react-router-dom";
 import PlaybookSpecIcon from "../../Settings/PlaybookSpecIcon";
+import { ApprovePlaybookButton } from "../ApprovePlaybookButton";
 import { getResourceForRun } from "../services";
 import ReRunPlaybookWithParamsButton from "../Submit/ReRunPlaybookWithParamsButton";
 import { PlaybookStatusDescription } from "./../PlaybookRunsStatus";
@@ -73,15 +74,7 @@ export default function PlaybookRunsActions({
 
           <VerticalDescription
             label="Status"
-            value={
-              <PlaybookStatusDescription
-                status={data.status}
-                playbookTitle={data.playbooks?.title ?? data.playbooks?.name!}
-                showApproveButton
-                playbookRunId={data.id}
-                refetch={refetch}
-              />
-            }
+            value={<PlaybookStatusDescription status={data.status} />}
           />
           <VerticalDescription
             label="Started"
@@ -130,14 +123,23 @@ export default function PlaybookRunsActions({
             />
           )}
         </div>
-        <div className="ml-auto flex h-auto flex-col">
-          <ReRunPlaybookWithParamsButton
-            playbook={data.playbooks!}
-            params={data.parameters}
-            checkId={data.check_id}
-            componentId={data.component_id}
-            configId={data.config_id}
-          />
+        <div className="ml-auto flex h-auto flex-col justify-center gap-2">
+          <div className="flex flex-row gap-2">
+            <ApprovePlaybookButton
+              playbookRunId={data.id}
+              playbookTitle={data.playbooks?.title ?? data.playbooks?.name!}
+              refetch={refetch}
+              status={data.status}
+            />
+
+            <ReRunPlaybookWithParamsButton
+              playbook={data.playbooks!}
+              params={data.parameters}
+              checkId={data.check_id}
+              componentId={data.component_id}
+              configId={data.config_id}
+            />
+          </div>
         </div>
       </div>
       <div className="flex h-full flex-col">
diff --git a/src/components/Playbooks/Runs/ApprovePlaybookButton.tsx b/src/components/Playbooks/Runs/ApprovePlaybookButton.tsx
new file mode 100644
index 000000000..56bef9bc5
--- /dev/null
+++ b/src/components/Playbooks/Runs/ApprovePlaybookButton.tsx
@@ -0,0 +1,52 @@
+import { PlaybookRunStatus } from "@flanksource-ui/api/types/playbooks";
+import { Button } from "@flanksource-ui/ui/Buttons/Button";
+import { useState } from "react";
+import { BsCheck2 } from "react-icons/bs";
+import { Tooltip } from "react-tooltip";
+import ApprovePlaybookRunModal from "./ApprovePlaybookRunModal";
+
+type ApprovePlaybookButtonProps = {
+  playbookTitle: string;
+  playbookRunId: string;
+  status: PlaybookRunStatus;
+  refetch: () => void;
+};
+
+export function ApprovePlaybookButton({
+  playbookTitle,
+  playbookRunId,
+  status,
+  refetch = () => {}
+}: ApprovePlaybookButtonProps) {
+  const [showApprovalModal, setShowApprovalModal] = useState(false);
+
+  if (status !== "pending_approval") {
+    return null;
+  }
+
+  return (
+    <>
+      <Button
+        data-tooltip-content={`Approve ${playbookTitle} Run`}
+        id="approve-playbook-run"
+        className="btn-primary min-w-max space-x-1"
+        onClick={() => {
+          setShowApprovalModal(true);
+        }}
+      >
+        <BsCheck2 className="h-5 w-5" />
+        <span className="capitalize">Pending Approval</span>
+      </Button>
+      <ApprovePlaybookRunModal
+        onClose={() => {
+          setShowApprovalModal(false);
+        }}
+        open={showApprovalModal}
+        playbookTitle={playbookTitle}
+        playbookRunId={playbookRunId}
+        refetch={refetch}
+      />
+      <Tooltip id="approve-playbook-run" />
+    </>
+  );
+}
diff --git a/src/components/Playbooks/Runs/PlaybookRunsStatus.tsx b/src/components/Playbooks/Runs/PlaybookRunsStatus.tsx
index bcee0c9af..ee92018bd 100644
--- a/src/components/Playbooks/Runs/PlaybookRunsStatus.tsx
+++ b/src/components/Playbooks/Runs/PlaybookRunsStatus.tsx
@@ -1,55 +1,9 @@
-import { Button } from "@flanksource-ui/ui/Buttons/Button";
-import { useState } from "react";
-import { Tooltip } from "react-tooltip";
 import {
   PlaybookRunsStatusProps,
   PlaybookStatusIcon
-} from "../../../ui/Icons/PlaybookStatusIcon";
-import ApprovePlaybookRunModal from "./ApprovePlaybookRunModal";
-
-export function PlaybookStatusDescription({
-  status,
-  playbookTitle,
-  showApproveButton = false,
-  playbookRunId,
-  refetch = () => {}
-}: PlaybookRunsStatusProps & {
-  playbookTitle: string;
-  showApproveButton?: boolean;
-  playbookRunId: string;
-  refetch?: () => void;
-}) {
-  const [showApprovalModal, setShowApprovalModal] = useState(false);
-
-  if (status === "pending_approval" && showApproveButton) {
-    return (
-      <>
-        <Button
-          data-tooltip-content={`Approve ${playbookTitle} Run`}
-          id="approve-playbook-run"
-          size="xs"
-          className="btn-link flex flex-row items-center"
-          onClick={() => {
-            setShowApprovalModal(true);
-          }}
-        >
-          <PlaybookStatusIcon status={status} />
-          <span className="capitalize">Pending Approval</span>
-        </Button>
-        <ApprovePlaybookRunModal
-          onClose={() => {
-            setShowApprovalModal(false);
-          }}
-          open={showApprovalModal}
-          playbookTitle={playbookTitle}
-          playbookRunId={playbookRunId}
-          refetch={refetch}
-        />
-        <Tooltip id="approve-playbook-run" />
-      </>
-    );
-  }
+} from "@flanksource-ui/ui/Icons/PlaybookStatusIcon";
 
+export function PlaybookStatusDescription({ status }: PlaybookRunsStatusProps) {
   return (
     <div className="flex flex-row items-center gap-1">
       <PlaybookStatusIcon status={status} />
diff --git a/src/ui/Icons/PlaybookStatusIcon.tsx b/src/ui/Icons/PlaybookStatusIcon.tsx
index 35f4b4a5a..5bfbd4584 100644
--- a/src/ui/Icons/PlaybookStatusIcon.tsx
+++ b/src/ui/Icons/PlaybookStatusIcon.tsx
@@ -1,3 +1,8 @@
+import {
+  PlaybookRunActionStatus,
+  PlaybookRunStatus
+} from "@flanksource-ui/api/types/playbooks";
+import { TbCircleDashedCheck } from "react-icons-v5/tb";
 import {
   BsCheckCircle,
   BsCircle,
@@ -7,10 +12,6 @@ import {
   BsStopCircle,
   BsXCircle
 } from "react-icons/bs";
-import {
-  PlaybookRunActionStatus,
-  PlaybookRunStatus
-} from "../../api/types/playbooks";
 
 export const statusIconMap: Record<
   PlaybookRunStatus | PlaybookRunActionStatus,
@@ -29,7 +30,7 @@ export const statusIconMap: Record<
     <BsCircle className="inline h-5 w-auto object-center text-orange-500" />
   ),
   pending_approval: (
-    <BsCircle className="inline h-5 w-auto object-center pr-1 text-orange-500" />
+    <TbCircleDashedCheck className="inline h-5 w-auto object-center pr-1 text-orange-500" />
   ),
   waiting: (
     <BsCircle className="inline h-5 w-auto object-center text-orange-500" />