diff --git a/app/javascript/components/miq-data-table/miq-table-cell.jsx b/app/javascript/components/miq-data-table/miq-table-cell.jsx
index 709c1e0d6fc..08e2f3d1cb8 100644
--- a/app/javascript/components/miq-data-table/miq-table-cell.jsx
+++ b/app/javascript/components/miq-data-table/miq-table-cell.jsx
@@ -76,6 +76,7 @@ const MiqTableCell = ({
   };
 
   const returnIcon = (icon, style, styledIconClass, longerTextClass, index = undefined) => {
+    icon = 'carbon--Migrate';
     const extraProps = {};
     if (index !== undefined) {
       extraProps.key = index.toString();
diff --git a/lib/gtl_formatter.rb b/lib/gtl_formatter.rb
index 65983c8ec27..feaa4a6f680 100644
--- a/lib/gtl_formatter.rb
+++ b/lib/gtl_formatter.rb
@@ -31,28 +31,28 @@ class GtlFormatter
   }.freeze
 
   NORMALIZED_STATE_ICON = {
-    'archived'                  => 'fa fa-archive',
-    'orphaned'                  => 'ff ff-orphaned',
-    'retired'                   => 'fa fa-clock-o',
-    'non_operational'           => 'fa fa-exclamation',
-    'suspended'                 => 'pficon pficon-asleep',
-    'standby'                   => 'pficon pficon-asleep',
-    'paused'                    => 'pficon pficon-asleep',
-    'disconnecting'             => 'pficon pficon-unplugged',
-    'image_locked'              => 'pficon pficon-locked',
-    'migrating'                 => 'pficon pficon-migration',
-    'shelved'                   => 'pficon pficon-pending',
-    'shelved_offloaded'         => 'pficon pficon-pending',
-    'reboot_in_progress'        => 'pficon pficon-on',
-    'wait_for_launch'           => 'pficon pficon-asleep',
-    'on'                        => 'pficon pficon-on',
-    'never'                     => 'pficon pficon-off',
-    'terminated'                => 'pficon pficon-off',
-    'off'                       => 'pficon pficon-off',
-    'template'                  => 'pficon pficon-template',
-    'powering_up'               => 'pficon pficon-on',
-    'powering_down'             => 'pficon pficon-off',
-    'unknown'                   => 'pficon pficon-unknown',
+    'archived'                  => 'carbon--Box',
+    'orphaned'                  => 'carbon--Unlink',
+    'retired'                   => 'carbon--Time',
+    'non_operational'           => 'carbon--WarningSquare',
+    'suspended'                 => 'carbon--asleep',
+    'standby'                   => 'carbon--asleep',
+    'paused'                    => 'carbon--asleep',
+    'disconnecting'             => 'carbon--FlashOff',
+    'image_locked'              => 'carbon--Locked',
+    'migrating'                 => 'carbon--Migrate',
+    'shelved'                   => 'carbon--Hourglass',
+    'shelved_offloaded'         => 'carbon--Hourglass',
+    'reboot_in_progress'        => 'carbon--Power',
+    'wait_for_launch'           => 'carbon--asleep',
+    'on'                        => 'carbon--Power',
+    'never'                     => 'carbon--Power',
+    'terminated'                => 'carbon--Power',
+    'off'                       => 'carbon--Power',
+    'template'                  => 'carbon--Template',
+    'powering_up'               => 'carbon--Power',
+    'powering_down'             => 'carbon--Power',
+    'unknown'                   => 'carbon--Unknown',
   }.freeze
 
   COLUMN_WITH_TIME = %w[