diff --git a/sass/components/Dashboard/dashboard.scss b/sass/components/Dashboard/dashboard.scss
index c4544904d..7bc006d26 100644
--- a/sass/components/Dashboard/dashboard.scss
+++ b/sass/components/Dashboard/dashboard.scss
@@ -1,13 +1,14 @@
 .kubevirt-dashboard__body {
-  padding: .75rem;
+  padding: 0.75rem;
   background-color: whitesmoke;
 }
 
 .kubevirt-dashboard__card {
-  margin: .75rem;
-  .card-pf-title {
-    font-size:1rem;
-  }
+  margin: 0.75rem;
+}
+
+.kubevirt-dashboard__card-title {
+  font-size: 1rem;
 }
 
 .kubevirt-dashboard__card-heading {
diff --git a/src/components/ClusterOverview/Alerts/tests/__snapshots__/Alerts.test.js.snap b/src/components/ClusterOverview/Alerts/tests/__snapshots__/Alerts.test.js.snap
index e8e2da958..b25b43ed5 100644
--- a/src/components/ClusterOverview/Alerts/tests/__snapshots__/Alerts.test.js.snap
+++ b/src/components/ClusterOverview/Alerts/tests/__snapshots__/Alerts.test.js.snap
@@ -7,7 +7,9 @@ exports[`<Alerts /> renders correctly 1`] = `
   <DashboardCardHeader
     className={null}
   >
-    <DashboardCardTitle>
+    <DashboardCardTitle
+      className={null}
+    >
       Alerts
     </DashboardCardTitle>
   </DashboardCardHeader>
diff --git a/src/components/ClusterOverview/Capacity/tests/__snapshots__/Capacity.test.js.snap b/src/components/ClusterOverview/Capacity/tests/__snapshots__/Capacity.test.js.snap
index 4abcd282e..76db1abe5 100644
--- a/src/components/ClusterOverview/Capacity/tests/__snapshots__/Capacity.test.js.snap
+++ b/src/components/ClusterOverview/Capacity/tests/__snapshots__/Capacity.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Capacity /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Cluster Capacity
     </h2>
@@ -100,7 +100,7 @@ exports[`<Capacity /> renders correctly in Loading state 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Cluster Capacity
     </h2>
diff --git a/src/components/ClusterOverview/Compliance/tests/__snapshots__/Compliance.test.js.snap b/src/components/ClusterOverview/Compliance/tests/__snapshots__/Compliance.test.js.snap
index 5ae896153..88df5b6d3 100644
--- a/src/components/ClusterOverview/Compliance/tests/__snapshots__/Compliance.test.js.snap
+++ b/src/components/ClusterOverview/Compliance/tests/__snapshots__/Compliance.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Compliance /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Cluster Compliance
     </h2>
diff --git a/src/components/ClusterOverview/Details/tests/__snapshots__/Details.test.js.snap b/src/components/ClusterOverview/Details/tests/__snapshots__/Details.test.js.snap
index 5115c9f8d..1a8ced9f3 100644
--- a/src/components/ClusterOverview/Details/tests/__snapshots__/Details.test.js.snap
+++ b/src/components/ClusterOverview/Details/tests/__snapshots__/Details.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Details /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Details
     </h2>
diff --git a/src/components/ClusterOverview/Events/tests/__snapshots__/Events.test.js.snap b/src/components/ClusterOverview/Events/tests/__snapshots__/Events.test.js.snap
index 5869749a0..de78fc444 100644
--- a/src/components/ClusterOverview/Events/tests/__snapshots__/Events.test.js.snap
+++ b/src/components/ClusterOverview/Events/tests/__snapshots__/Events.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Events /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading kubevirt-events__card-header"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Cluster Events
     </h2>
@@ -18,7 +18,7 @@ exports[`<Events /> renders correctly 1`] = `
     >
       <span
         aria-hidden="true"
-        class="fa fa-info-circle fa-2x"
+        class="fa fa-info-circle kubevirt-dashboard__icon-sm"
       />
     </button>
   </div>
diff --git a/src/components/ClusterOverview/Health/tests/__snapshots__/Health.test.js.snap b/src/components/ClusterOverview/Health/tests/__snapshots__/Health.test.js.snap
index 63ed01ad9..1aec15091 100644
--- a/src/components/ClusterOverview/Health/tests/__snapshots__/Health.test.js.snap
+++ b/src/components/ClusterOverview/Health/tests/__snapshots__/Health.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Health /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Cluster Health
     </h2>
diff --git a/src/components/ClusterOverview/Health/tests/__snapshots__/HealthBody.test.js.snap b/src/components/ClusterOverview/Health/tests/__snapshots__/HealthBody.test.js.snap
index 63ed01ad9..1aec15091 100644
--- a/src/components/ClusterOverview/Health/tests/__snapshots__/HealthBody.test.js.snap
+++ b/src/components/ClusterOverview/Health/tests/__snapshots__/HealthBody.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Health /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Cluster Health
     </h2>
diff --git a/src/components/ClusterOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap b/src/components/ClusterOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap
index 74ce0ac01..8d143421a 100644
--- a/src/components/ClusterOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap
+++ b/src/components/ClusterOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Inventory /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Cluster inventory
     </h2>
@@ -18,7 +18,7 @@ exports[`<Inventory /> renders correctly 1`] = `
     >
       <span
         aria-hidden="true"
-        class="fa fa-info-circle fa-2x"
+        class="fa fa-info-circle kubevirt-dashboard__icon-sm"
       />
     </button>
   </div>
@@ -42,7 +42,7 @@ exports[`<Inventory /> renders correctly 1`] = `
         >
           <span
             aria-hidden="true"
-            class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+            class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
           />
           <span
             class="kubevirt-inventory__row-status-item-text"
@@ -84,7 +84,7 @@ exports[`<Inventory /> renders correctly 1`] = `
         >
           <span
             aria-hidden="true"
-            class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+            class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
           />
           <span
             class="kubevirt-inventory__row-status-item-text"
@@ -111,7 +111,7 @@ exports[`<Inventory /> renders correctly 1`] = `
         >
           <span
             aria-hidden="true"
-            class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+            class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
           />
           <span
             class="kubevirt-inventory__row-status-item-text"
@@ -151,7 +151,7 @@ exports[`<Inventory /> renders correctly 1`] = `
         >
           <span
             aria-hidden="true"
-            class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+            class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
           />
           <span
             class="kubevirt-inventory__row-status-item-text"
diff --git a/src/components/ClusterOverview/TopConsumers/tests/__snapshots__/TopConsumers.test.js.snap b/src/components/ClusterOverview/TopConsumers/tests/__snapshots__/TopConsumers.test.js.snap
index d1f2851ae..fc8916717 100644
--- a/src/components/ClusterOverview/TopConsumers/tests/__snapshots__/TopConsumers.test.js.snap
+++ b/src/components/ClusterOverview/TopConsumers/tests/__snapshots__/TopConsumers.test.js.snap
@@ -8,7 +8,7 @@ exports[`<TopConsumers /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Top Consumers
     </h2>
@@ -18,7 +18,7 @@ exports[`<TopConsumers /> renders correctly 1`] = `
     >
       <span
         aria-hidden="true"
-        class="fa fa-info-circle fa-2x"
+        class="fa fa-info-circle kubevirt-dashboard__icon-sm"
       />
     </button>
   </div>
diff --git a/src/components/ClusterOverview/Utilization/tests/__snapshots__/Utilization.test.js.snap b/src/components/ClusterOverview/Utilization/tests/__snapshots__/Utilization.test.js.snap
index 7d8c9a24b..44a2dd713 100644
--- a/src/components/ClusterOverview/Utilization/tests/__snapshots__/Utilization.test.js.snap
+++ b/src/components/ClusterOverview/Utilization/tests/__snapshots__/Utilization.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Utilization /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Cluster Utilization
     </h2>
@@ -119,7 +119,7 @@ exports[`<Utilization /> renders correctly in Loading state 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Cluster Utilization
     </h2>
diff --git a/src/components/ClusterOverview/tests/__snapshots__/ClusterOverview.test.js.snap b/src/components/ClusterOverview/tests/__snapshots__/ClusterOverview.test.js.snap
index 4abdaadf1..15b3e0cab 100644
--- a/src/components/ClusterOverview/tests/__snapshots__/ClusterOverview.test.js.snap
+++ b/src/components/ClusterOverview/tests/__snapshots__/ClusterOverview.test.js.snap
@@ -24,7 +24,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                 class="card-pf-heading kubevirt-dashboard__card-heading"
               >
                 <h2
-                  class="card-pf-title"
+                  class="card-pf-title kubevirt-dashboard__card-title"
                 >
                   Details
                 </h2>
@@ -83,7 +83,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                 class="card-pf-heading kubevirt-dashboard__card-heading"
               >
                 <h2
-                  class="card-pf-title"
+                  class="card-pf-title kubevirt-dashboard__card-title"
                 >
                   Cluster inventory
                 </h2>
@@ -93,7 +93,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                 >
                   <span
                     aria-hidden="true"
-                    class="fa fa-info-circle fa-2x"
+                    class="fa fa-info-circle kubevirt-dashboard__icon-sm"
                   />
                 </button>
               </div>
@@ -117,7 +117,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                     >
                       <span
                         aria-hidden="true"
-                        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+                        class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
                       />
                       <span
                         class="kubevirt-inventory__row-status-item-text"
@@ -159,7 +159,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                     >
                       <span
                         aria-hidden="true"
-                        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+                        class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
                       />
                       <span
                         class="kubevirt-inventory__row-status-item-text"
@@ -186,7 +186,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                     >
                       <span
                         aria-hidden="true"
-                        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+                        class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
                       />
                       <span
                         class="kubevirt-inventory__row-status-item-text"
@@ -226,7 +226,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                     >
                       <span
                         aria-hidden="true"
-                        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+                        class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
                       />
                       <span
                         class="kubevirt-inventory__row-status-item-text"
@@ -257,7 +257,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                 class="card-pf-heading kubevirt-dashboard__card-heading kubevirt-events__card-header"
               >
                 <h2
-                  class="card-pf-title"
+                  class="card-pf-title kubevirt-dashboard__card-title"
                 >
                   Cluster Events
                 </h2>
@@ -267,7 +267,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                 >
                   <span
                     aria-hidden="true"
-                    class="fa fa-info-circle fa-2x"
+                    class="fa fa-info-circle kubevirt-dashboard__icon-sm"
                   />
                 </button>
               </div>
@@ -295,7 +295,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                 class="card-pf-heading kubevirt-dashboard__card-heading"
               >
                 <h2
-                  class="card-pf-title"
+                  class="card-pf-title kubevirt-dashboard__card-title"
                 >
                   Top Consumers
                 </h2>
@@ -305,7 +305,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
                 >
                   <span
                     aria-hidden="true"
-                    class="fa fa-info-circle fa-2x"
+                    class="fa fa-info-circle kubevirt-dashboard__icon-sm"
                   />
                 </button>
               </div>
diff --git a/src/components/Dashboard/DashboardCard/DashboardCardTitle.js b/src/components/Dashboard/DashboardCard/DashboardCardTitle.js
index c8c2b9c8e..5f0152bd3 100644
--- a/src/components/Dashboard/DashboardCard/DashboardCardTitle.js
+++ b/src/components/Dashboard/DashboardCard/DashboardCardTitle.js
@@ -1,15 +1,22 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import classNames from 'classnames';
 import { CardTitle } from 'patternfly-react';
 
-const DashboardCardTitle = ({ children, ...props }) => <CardTitle {...props}>{children}</CardTitle>;
+const DashboardCardTitle = ({ className, children, ...props }) => (
+  <CardTitle {...props} className={classNames('kubevirt-dashboard__card-title', className)}>
+    {children}
+  </CardTitle>
+);
 
 DashboardCardTitle.defaultProps = {
   children: null,
+  className: null,
 };
 
 DashboardCardTitle.propTypes = {
   children: PropTypes.node,
+  className: PropTypes.string,
 };
 
 export default DashboardCardTitle;
diff --git a/src/components/Dashboard/DashboardCard/tests/__snapshots__/DashboardCardTitle.test.js.snap b/src/components/Dashboard/DashboardCard/tests/__snapshots__/DashboardCardTitle.test.js.snap
index 894410e74..7442e042c 100644
--- a/src/components/Dashboard/DashboardCard/tests/__snapshots__/DashboardCardTitle.test.js.snap
+++ b/src/components/Dashboard/DashboardCard/tests/__snapshots__/DashboardCardTitle.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`<DashboardCardTitle /> renders correctly 1`] = `
 <CardTitle
-  className=""
+  className="kubevirt-dashboard__card-title"
 >
   content
 </CardTitle>
diff --git a/src/components/Dashboard/DashboardCard/tests/__snapshots__/DashboardCardTitleHelp.test.js.snap b/src/components/Dashboard/DashboardCard/tests/__snapshots__/DashboardCardTitleHelp.test.js.snap
index 4d009d908..377b52b66 100644
--- a/src/components/Dashboard/DashboardCard/tests/__snapshots__/DashboardCardTitleHelp.test.js.snap
+++ b/src/components/Dashboard/DashboardCard/tests/__snapshots__/DashboardCardTitleHelp.test.js.snap
@@ -28,8 +28,8 @@ exports[`<DashboardCardTitleHelp /> renders correctly 1`] = `
     disabled={false}
   >
     <Icon
+      className="kubevirt-dashboard__icon-sm"
       name="info-circle"
-      size="2x"
       type="fa"
     />
   </Button>
diff --git a/src/components/Dashboard/Inventory/InventoryItemStatus.js b/src/components/Dashboard/Inventory/InventoryItemStatus.js
index 37951436f..ede5e4fc0 100644
--- a/src/components/Dashboard/Inventory/InventoryItemStatus.js
+++ b/src/components/Dashboard/Inventory/InventoryItemStatus.js
@@ -8,7 +8,11 @@ const StatusPropTypes = {
 
 const OkStatus = ({ count }) => (
   <div className="kubevirt-inventory__row-status-item">
-    <Icon type="fa" name="check-circle" className="kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm" />
+    <Icon
+      type="fa"
+      name="check-circle"
+      className="kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
+    />
     <span className="kubevirt-inventory__row-status-item-text">{count}</span>
   </div>
 );
@@ -17,7 +21,11 @@ OkStatus.propTypes = StatusPropTypes;
 
 const WarnStatus = ({ count }) => (
   <div className="kubevirt-inventory__row-status-item">
-    <Icon type="fa" name="exclamation-triangle" className="kubevirt-inventory__row-status-item-icon--warn kubevirt-dashboard__icon-sm" />
+    <Icon
+      type="fa"
+      name="exclamation-triangle"
+      className="kubevirt-inventory__row-status-item-icon--warn kubevirt-dashboard__icon-sm"
+    />
     <span className="kubevirt-inventory__row-status-item-text">{count}</span>
   </div>
 );
@@ -26,7 +34,11 @@ WarnStatus.propTypes = StatusPropTypes;
 
 const ErrorStatus = ({ count }) => (
   <div className="kubevirt-inventory__row-status-item">
-    <Icon type="fa" name="exclamation-circle" className="kubevirt-inventory__row-status-item-icon--error kubevirt-dashboard__icon-sm" />
+    <Icon
+      type="fa"
+      name="exclamation-circle"
+      className="kubevirt-inventory__row-status-item-icon--error kubevirt-dashboard__icon-sm"
+    />
     <span className="kubevirt-inventory__row-status-item-text">{count}</span>
   </div>
 );
@@ -35,7 +47,11 @@ ErrorStatus.propTypes = StatusPropTypes;
 
 const InProgressStatus = ({ count }) => (
   <div className="kubevirt-inventory__row-status-item">
-    <Icon type="pf" name="in-progress" className="kubevirt-inventory__row-status-item-icon--in-progress kubevirt-dashboard__icon-s" />
+    <Icon
+      type="pf"
+      name="in-progress"
+      className="kubevirt-inventory__row-status-item-icon--in-progress kubevirt-dashboard__icon-sm"
+    />
     <span className="kubevirt-inventory__row-status-item-text">{count}</span>
   </div>
 );
diff --git a/src/components/Dashboard/Inventory/tests/__snapshots__/InventoryItemStatus.test.js.snap b/src/components/Dashboard/Inventory/tests/__snapshots__/InventoryItemStatus.test.js.snap
index 623d8519a..badfead94 100644
--- a/src/components/Dashboard/Inventory/tests/__snapshots__/InventoryItemStatus.test.js.snap
+++ b/src/components/Dashboard/Inventory/tests/__snapshots__/InventoryItemStatus.test.js.snap
@@ -9,7 +9,7 @@ exports[`<InventoryItemStatus /> renders correctly 1`] = `
   >
     <span
       aria-hidden="true"
-      class="pficon pficon-in-progress kubevirt-inventory__row-status-item-icon--in-progress"
+      class="pficon pficon-in-progress kubevirt-inventory__row-status-item-icon--in-progress kubevirt-dashboard__icon-sm"
     />
     <span
       class="kubevirt-inventory__row-status-item-text"
@@ -22,7 +22,7 @@ exports[`<InventoryItemStatus /> renders correctly 1`] = `
   >
     <span
       aria-hidden="true"
-      class="fa fa-exclamation-circle fa-2x kubevirt-inventory__row-status-item-icon--error"
+      class="fa fa-exclamation-circle kubevirt-inventory__row-status-item-icon--error kubevirt-dashboard__icon-sm"
     />
     <span
       class="kubevirt-inventory__row-status-item-text"
@@ -35,7 +35,7 @@ exports[`<InventoryItemStatus /> renders correctly 1`] = `
   >
     <span
       aria-hidden="true"
-      class="fa fa-exclamation-triangle fa-2x kubevirt-inventory__row-status-item-icon--warn"
+      class="fa fa-exclamation-triangle kubevirt-inventory__row-status-item-icon--warn kubevirt-dashboard__icon-sm"
     />
     <span
       class="kubevirt-inventory__row-status-item-text"
@@ -61,7 +61,7 @@ exports[`<InventoryItemStatus /> renders correctly 1`] = `
   >
     <span
       aria-hidden="true"
-      class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+      class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
     />
     <span
       class="kubevirt-inventory__row-status-item-text"
diff --git a/src/components/Dashboard/Inventory/tests/__snapshots__/InventoryRow.test.js.snap b/src/components/Dashboard/Inventory/tests/__snapshots__/InventoryRow.test.js.snap
index 91b30c00b..336f5eaf1 100644
--- a/src/components/Dashboard/Inventory/tests/__snapshots__/InventoryRow.test.js.snap
+++ b/src/components/Dashboard/Inventory/tests/__snapshots__/InventoryRow.test.js.snap
@@ -18,7 +18,7 @@ exports[`<InventoryRow /> renders correctly 1`] = `
     >
       <span
         aria-hidden="true"
-        class="pficon pficon-in-progress kubevirt-inventory__row-status-item-icon--in-progress"
+        class="pficon pficon-in-progress kubevirt-inventory__row-status-item-icon--in-progress kubevirt-dashboard__icon-sm"
       />
       <span
         class="kubevirt-inventory__row-status-item-text"
@@ -31,7 +31,7 @@ exports[`<InventoryRow /> renders correctly 1`] = `
     >
       <span
         aria-hidden="true"
-        class="fa fa-exclamation-circle fa-2x kubevirt-inventory__row-status-item-icon--error"
+        class="fa fa-exclamation-circle kubevirt-inventory__row-status-item-icon--error kubevirt-dashboard__icon-sm"
       />
       <span
         class="kubevirt-inventory__row-status-item-text"
@@ -44,7 +44,7 @@ exports[`<InventoryRow /> renders correctly 1`] = `
     >
       <span
         aria-hidden="true"
-        class="fa fa-exclamation-triangle fa-2x kubevirt-inventory__row-status-item-icon--warn"
+        class="fa fa-exclamation-triangle kubevirt-inventory__row-status-item-icon--warn kubevirt-dashboard__icon-sm"
       />
       <span
         class="kubevirt-inventory__row-status-item-text"
@@ -70,7 +70,7 @@ exports[`<InventoryRow /> renders correctly 1`] = `
     >
       <span
         aria-hidden="true"
-        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+        class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
       />
       <span
         class="kubevirt-inventory__row-status-item-text"
diff --git a/src/components/Dashboard/tests/__snapshots__/Dashboard.api.test.js.snap b/src/components/Dashboard/tests/__snapshots__/Dashboard.api.test.js.snap
index 86d11bc6a..bac026aef 100644
--- a/src/components/Dashboard/tests/__snapshots__/Dashboard.api.test.js.snap
+++ b/src/components/Dashboard/tests/__snapshots__/Dashboard.api.test.js.snap
@@ -32,12 +32,14 @@ exports[`<Dashboard /> API renders correctly 1`] = `
                   <div
                     className="card-pf-heading kubevirt-dashboard__card-heading"
                   >
-                    <DashboardCardTitle>
+                    <DashboardCardTitle
+                      className={null}
+                    >
                       <CardTitle
-                        className=""
+                        className="kubevirt-dashboard__card-title"
                       >
                         <h2
-                          className="card-pf-title"
+                          className="card-pf-title kubevirt-dashboard__card-title"
                         >
                           Red Card
                         </h2>
@@ -78,17 +80,17 @@ exports[`<Dashboard /> API renders correctly 1`] = `
                             type="button"
                           >
                             <Icon
+                              className="kubevirt-dashboard__icon-sm"
                               name="info-circle"
-                              size="2x"
                               type="fa"
                             >
                               <FontAwesome
+                                className="kubevirt-dashboard__icon-sm"
                                 name="info-circle"
-                                size="2x"
                               >
                                 <span
                                   aria-hidden={true}
-                                  className="fa fa-info-circle fa-2x"
+                                  className="fa fa-info-circle kubevirt-dashboard__icon-sm"
                                 />
                               </FontAwesome>
                             </Icon>
@@ -155,12 +157,14 @@ exports[`<Dashboard /> API renders correctly 1`] = `
                   <div
                     className="card-pf-heading kubevirt-dashboard__card-heading"
                   >
-                    <DashboardCardTitle>
+                    <DashboardCardTitle
+                      className={null}
+                    >
                       <CardTitle
-                        className=""
+                        className="kubevirt-dashboard__card-title"
                       >
                         <h2
-                          className="card-pf-title"
+                          className="card-pf-title kubevirt-dashboard__card-title"
                         >
                           Blue Card
                         </h2>
diff --git a/src/components/StorageOverview/Capacity/tests/__snapshots__/Capacity.test.js.snap b/src/components/StorageOverview/Capacity/tests/__snapshots__/Capacity.test.js.snap
index 3104cae70..89c8bee9d 100644
--- a/src/components/StorageOverview/Capacity/tests/__snapshots__/Capacity.test.js.snap
+++ b/src/components/StorageOverview/Capacity/tests/__snapshots__/Capacity.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Capacity /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Capacity
     </h2>
@@ -53,7 +53,7 @@ exports[`<Capacity /> renders correctly in Loading state 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Capacity
     </h2>
diff --git a/src/components/StorageOverview/Details/tests/__snapshots__/Details.test.js.snap b/src/components/StorageOverview/Details/tests/__snapshots__/Details.test.js.snap
index d313cccc3..5daaf367c 100644
--- a/src/components/StorageOverview/Details/tests/__snapshots__/Details.test.js.snap
+++ b/src/components/StorageOverview/Details/tests/__snapshots__/Details.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Details /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       OCS Details
     </h2>
diff --git a/src/components/StorageOverview/Events/tests/__snapshots__/Events.test.js.snap b/src/components/StorageOverview/Events/tests/__snapshots__/Events.test.js.snap
index 8da2a073e..774c65c92 100644
--- a/src/components/StorageOverview/Events/tests/__snapshots__/Events.test.js.snap
+++ b/src/components/StorageOverview/Events/tests/__snapshots__/Events.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Events /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading kubevirt-events__card-header"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Events
     </h2>
@@ -18,7 +18,7 @@ exports[`<Events /> renders correctly 1`] = `
     >
       <span
         aria-hidden="true"
-        class="fa fa-info-circle fa-2x"
+        class="fa fa-info-circle kubevirt-dashboard__icon-sm"
       />
     </button>
   </div>
diff --git a/src/components/StorageOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap b/src/components/StorageOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap
index a4ce54a21..6ad2fa101 100644
--- a/src/components/StorageOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap
+++ b/src/components/StorageOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Inventory /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Inventory
     </h2>
@@ -18,7 +18,7 @@ exports[`<Inventory /> renders correctly 1`] = `
     >
       <span
         aria-hidden="true"
-        class="fa fa-info-circle fa-2x"
+        class="fa fa-info-circle kubevirt-dashboard__icon-sm"
       />
     </button>
   </div>
@@ -42,7 +42,7 @@ exports[`<Inventory /> renders correctly 1`] = `
         >
           <span
             aria-hidden="true"
-            class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+            class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
           />
           <span
             class="kubevirt-inventory__row-status-item-text"
@@ -69,7 +69,7 @@ exports[`<Inventory /> renders correctly 1`] = `
         >
           <span
             aria-hidden="true"
-            class="fa fa-exclamation-circle fa-2x kubevirt-inventory__row-status-item-icon--error"
+            class="fa fa-exclamation-circle kubevirt-inventory__row-status-item-icon--error kubevirt-dashboard__icon-sm"
           />
           <span
             class="kubevirt-inventory__row-status-item-text"
@@ -82,7 +82,7 @@ exports[`<Inventory /> renders correctly 1`] = `
         >
           <span
             aria-hidden="true"
-            class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+            class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
           />
           <span
             class="kubevirt-inventory__row-status-item-text"
@@ -109,7 +109,7 @@ exports[`<Inventory /> renders correctly 1`] = `
         >
           <span
             aria-hidden="true"
-            class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+            class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
           />
           <span
             class="kubevirt-inventory__row-status-item-text"
@@ -136,7 +136,7 @@ exports[`<Inventory /> renders correctly 1`] = `
         >
           <span
             aria-hidden="true"
-            class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+            class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
           />
           <span
             class="kubevirt-inventory__row-status-item-text"
diff --git a/src/components/StorageOverview/OCSHealth/tests/__snapshots__/Health.test.js.snap b/src/components/StorageOverview/OCSHealth/tests/__snapshots__/Health.test.js.snap
index a1d87a169..76b8ea1c9 100644
--- a/src/components/StorageOverview/OCSHealth/tests/__snapshots__/Health.test.js.snap
+++ b/src/components/StorageOverview/OCSHealth/tests/__snapshots__/Health.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Health /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Health
     </h2>
diff --git a/src/components/StorageOverview/OCSHealth/tests/__snapshots__/HealthBody.test.js.snap b/src/components/StorageOverview/OCSHealth/tests/__snapshots__/HealthBody.test.js.snap
index a1d87a169..76b8ea1c9 100644
--- a/src/components/StorageOverview/OCSHealth/tests/__snapshots__/HealthBody.test.js.snap
+++ b/src/components/StorageOverview/OCSHealth/tests/__snapshots__/HealthBody.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Health /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Health
     </h2>
diff --git a/src/components/StorageOverview/Utilization/tests/__snapshots__/Utilization.test.js.snap b/src/components/StorageOverview/Utilization/tests/__snapshots__/Utilization.test.js.snap
index 84eddc203..71830c2f3 100644
--- a/src/components/StorageOverview/Utilization/tests/__snapshots__/Utilization.test.js.snap
+++ b/src/components/StorageOverview/Utilization/tests/__snapshots__/Utilization.test.js.snap
@@ -8,7 +8,7 @@ exports[`<Utilization /> renders correctly 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Perfrormance
     </h2>
@@ -119,7 +119,7 @@ exports[`<Utilization /> renders correctly in Loading state 1`] = `
     class="card-pf-heading kubevirt-dashboard__card-heading"
   >
     <h2
-      class="card-pf-title"
+      class="card-pf-title kubevirt-dashboard__card-title"
     >
       Perfrormance
     </h2>
diff --git a/src/components/StorageOverview/tests/__snapshots__/StorageOverview.test.js.snap b/src/components/StorageOverview/tests/__snapshots__/StorageOverview.test.js.snap
index 95272b27d..18d0bdda0 100644
--- a/src/components/StorageOverview/tests/__snapshots__/StorageOverview.test.js.snap
+++ b/src/components/StorageOverview/tests/__snapshots__/StorageOverview.test.js.snap
@@ -24,7 +24,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                 class="card-pf-heading kubevirt-dashboard__card-heading"
               >
                 <h2
-                  class="card-pf-title"
+                  class="card-pf-title kubevirt-dashboard__card-title"
                 >
                   OCS Details
                 </h2>
@@ -71,7 +71,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                 class="card-pf-heading kubevirt-dashboard__card-heading"
               >
                 <h2
-                  class="card-pf-title"
+                  class="card-pf-title kubevirt-dashboard__card-title"
                 >
                   Inventory
                 </h2>
@@ -81,7 +81,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                 >
                   <span
                     aria-hidden="true"
-                    class="fa fa-info-circle fa-2x"
+                    class="fa fa-info-circle kubevirt-dashboard__icon-sm"
                   />
                 </button>
               </div>
@@ -105,7 +105,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                     >
                       <span
                         aria-hidden="true"
-                        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+                        class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
                       />
                       <span
                         class="kubevirt-inventory__row-status-item-text"
@@ -132,7 +132,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                     >
                       <span
                         aria-hidden="true"
-                        class="fa fa-exclamation-circle fa-2x kubevirt-inventory__row-status-item-icon--error"
+                        class="fa fa-exclamation-circle kubevirt-inventory__row-status-item-icon--error kubevirt-dashboard__icon-sm"
                       />
                       <span
                         class="kubevirt-inventory__row-status-item-text"
@@ -145,7 +145,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                     >
                       <span
                         aria-hidden="true"
-                        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+                        class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
                       />
                       <span
                         class="kubevirt-inventory__row-status-item-text"
@@ -172,7 +172,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                     >
                       <span
                         aria-hidden="true"
-                        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+                        class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
                       />
                       <span
                         class="kubevirt-inventory__row-status-item-text"
@@ -199,7 +199,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                     >
                       <span
                         aria-hidden="true"
-                        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+                        class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
                       />
                       <span
                         class="kubevirt-inventory__row-status-item-text"
@@ -230,7 +230,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                 class="card-pf-heading kubevirt-dashboard__card-heading"
               >
                 <h2
-                  class="card-pf-title"
+                  class="card-pf-title kubevirt-dashboard__card-title"
                 >
                   Perfrormance
                 </h2>
@@ -342,7 +342,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                 class="card-pf-heading kubevirt-dashboard__card-heading kubevirt-events__card-header"
               >
                 <h2
-                  class="card-pf-title"
+                  class="card-pf-title kubevirt-dashboard__card-title"
                 >
                   Events
                 </h2>
@@ -352,7 +352,7 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                 >
                   <span
                     aria-hidden="true"
-                    class="fa fa-info-circle fa-2x"
+                    class="fa fa-info-circle kubevirt-dashboard__icon-sm"
                   />
                 </button>
               </div>