diff --git a/src/Components/ImagesTable/ImageBuildStatus.js b/src/Components/ImagesTable/ImageBuildStatus.js
index 6add77ce..ccc1b03f 100644
--- a/src/Components/ImagesTable/ImageBuildStatus.js
+++ b/src/Components/ImagesTable/ImageBuildStatus.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { Flex, Spinner } from '@patternfly/react-core';
-import { CheckCircleIcon, PendingIcon, ExclamationCircleIcon } from '@patternfly/react-icons';
+import { Flex } from '@patternfly/react-core';
+import { CheckCircleIcon, PendingIcon, ExclamationCircleIcon, InProgressIcon } from '@patternfly/react-icons';
 
 import './ImageBuildStatus.scss';
 
@@ -29,49 +29,25 @@ const ImageBuildStatus = (props) => {
         // Keep "running" for backward compatibility
         running: [
             {
-                icon: <Spinner size="md" />,
+                icon: <InProgressIcon className="pending" />,
                 text: 'Image build in progress'
-            },
-            {
-                icon: <PendingIcon />,
-                text: 'Upload, Cloud registration pending'
             }
         ],
         building: [
             {
-                icon: <Spinner size="md" />,
+                icon: <InProgressIcon className="pending" />,
                 text: 'Image build in progress'
-            },
-            {
-                icon: <PendingIcon />,
-                text: 'Upload, Cloud registration pending'
             }
         ],
         uploading: [
             {
-                icon: <CheckCircleIcon />,
-                text: 'Image build finished'
-            },
-            {
-                icon: <Spinner size="md" />,
+                icon: <InProgressIcon className="pending" />,
                 text: 'Image upload in progress'
-            },
-            {
-                icon: <PendingIcon />,
-                text: 'Cloud registration pending'
             }
         ],
         registering: [
             {
-                icon: <CheckCircleIcon />,
-                text: 'Image build finished'
-            },
-            {
-                icon: <CheckCircleIcon />,
-                text: 'Image upload finished'
-            },
-            {
-                icon: <Spinner size="md" />,
+                icon: <InProgressIcon className="pending" />,
                 text: 'Cloud registration in progress'
             }
         ]
diff --git a/src/Components/ImagesTable/ImageBuildStatus.scss b/src/Components/ImagesTable/ImageBuildStatus.scss
index 1bf099e2..1b725994 100644
--- a/src/Components/ImagesTable/ImageBuildStatus.scss
+++ b/src/Components/ImagesTable/ImageBuildStatus.scss
@@ -4,3 +4,6 @@
 .success {
   color: var(--pf-global--success-color--100);
 }
+.pending {
+  color: var(--pf-global--info-color--100);
+}