diff --git a/app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx b/app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
index fcd5aab89..579652889 100644
--- a/app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
+++ b/app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
@@ -123,7 +123,17 @@ export function EdgeDevicesDatatable({
     <div className="row">
       <div className="col-sm-12">
         <TableContainer>
-          <TableTitle icon="fa-plug" label="Edge Devices">
+          <TableTitle icon="box" featherIcon label="Edge Devices">
+            <SearchBar value={search} onChange={handleSearchBarChange} />
+            <TableActions>
+              <EdgeDevicesDatatableActions
+                selectedItems={selectedFlatRows.map((row) => row.original)}
+                isFDOEnabled={isFdoEnabled}
+                isOpenAMTEnabled={isOpenAmtEnabled}
+                setLoadingMessage={setLoadingMessage}
+                showWaitingRoomLink={showWaitingRoomLink}
+              />
+            </TableActions>
             <TableTitleActions>
               <ColumnVisibilityMenu<Environment>
                 columns={columnsToHide}
@@ -135,15 +145,6 @@ export function EdgeDevicesDatatable({
               </TableSettingsMenu>
             </TableTitleActions>
           </TableTitle>
-          <TableActions>
-            <EdgeDevicesDatatableActions
-              selectedItems={selectedFlatRows.map((row) => row.original)}
-              isFDOEnabled={isFdoEnabled}
-              isOpenAMTEnabled={isOpenAmtEnabled}
-              setLoadingMessage={setLoadingMessage}
-              showWaitingRoomLink={showWaitingRoomLink}
-            />
-          </TableActions>
           {isOpenAmtEnabled && someDeviceHasAMTActivated && (
             <div className={styles.kvmTip}>
               <TextTip color="blue">
@@ -161,7 +162,6 @@ export function EdgeDevicesDatatable({
               </TextTip>
             </div>
           )}
-          <SearchBar value={search} onChange={handleSearchBarChange} />
           <Table
             className={tableProps.className}
             role={tableProps.role}
diff --git a/app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx b/app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx
index 8e6be8cee..bb20186b1 100644
--- a/app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx
+++ b/app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx
@@ -33,13 +33,13 @@ export function EdgeDevicesDatatableActions({
         disabled={selectedItems.length < 1}
         color="danger"
         onClick={() => onDeleteEdgeDeviceClick()}
+        icon="trash-2"
+        featherIcon
       >
-        <i className="fa fa-trash-alt space-right" aria-hidden="true" />
         Remove
       </Button>
 
-      <Button onClick={() => onAddNewDeviceClick()}>
-        <i className="fa fa-plus-circle space-right" aria-hidden="true" />
+      <Button onClick={() => onAddNewDeviceClick()} icon="plus" featherIcon>
         Add Device
       </Button>
 
@@ -47,8 +47,9 @@ export function EdgeDevicesDatatableActions({
         <Button
           disabled={selectedItems.length !== 1}
           onClick={() => onAssociateOpenAMTClick(selectedItems)}
+          icon="link"
+          featherIcon
         >
-          <i className="fa fa-link space-right" aria-hidden="true" />
           Associate with OpenAMT
         </Button>
       )}