diff --git a/src/components/ProductMilestonePages/ProductMilestonePages.tsx b/src/components/ProductMilestonePages/ProductMilestonePages.tsx
index 96675e71..02262243 100644
--- a/src/components/ProductMilestonePages/ProductMilestonePages.tsx
+++ b/src/components/ProductMilestonePages/ProductMilestonePages.tsx
@@ -1,4 +1,3 @@
-import { Label, Tooltip } from '@patternfly/react-core';
 import { PropsWithChildren, useEffect } from 'react';
 import { Outlet, useOutletContext, useParams } from 'react-router-dom';
 
@@ -11,6 +10,7 @@ import { PageLayout } from 'components/PageLayout/PageLayout';
 import { ServiceContainerLoading } from 'components/ServiceContainers/ServiceContainerLoading';
 import { Tabs } from 'components/Tabs/Tabs';
 import { TabsItem } from 'components/Tabs/TabsItem';
+import { TabsLabel } from 'components/Tabs/TabsLabel';
 
 import * as productMilestoneApi from 'services/productMilestoneApi';
 
@@ -52,13 +52,9 @@ export const ProductMilestonePages = ({ children }: PropsWithChildren<IProductMi
       <TabsItem url="deliverables-analysis">Deliverables Analysis</TabsItem>
       <TabsItem url="delivered-artifacts">
         Delivered Artifacts{' '}
-        <Tooltip content="Total Count">
-          <Label>
-            <ServiceContainerLoading {...serviceContainerArtifacts} variant="inline" title="Delivered Artifacts Count">
-              {serviceContainerArtifacts.data?.totalHits}
-            </ServiceContainerLoading>
-          </Label>
-        </Tooltip>
+        <TabsLabel serviceContainer={serviceContainerArtifacts} title={'Delivered Artifacts Count'}>
+          {serviceContainerArtifacts.data?.totalHits}
+        </TabsLabel>
       </TabsItem>
       <TabsItem url="interconnection-graph">Interconnection Graph</TabsItem>
     </Tabs>
diff --git a/src/components/Tabs/Tabs.module.css b/src/components/Tabs/Tabs.module.css
index dc37a76c..5c86c6f3 100644
--- a/src/components/Tabs/Tabs.module.css
+++ b/src/components/Tabs/Tabs.module.css
@@ -2,3 +2,7 @@
   top: 0;
   z-index: 100;
 }
+
+.page-section-tabs :global(.pf-c-tabs) {
+  min-height: 42px;
+}
diff --git a/src/components/Tabs/TabsLabel.module.css b/src/components/Tabs/TabsLabel.module.css
new file mode 100644
index 00000000..14490c6d
--- /dev/null
+++ b/src/components/Tabs/TabsLabel.module.css
@@ -0,0 +1,13 @@
+.page-section-tabs-label :global(.pf-c-label) {
+  padding: 0px 4px;
+}
+
+.page-section-tabs-label :global(.pf-c-label__content) {
+  min-width: 25px;
+  height: 22px;
+  justify-content: center;
+}
+
+.page-section-tabs-label :global(.pf-c-spinner) {
+  height: 11px;
+}
diff --git a/src/components/Tabs/TabsLabel.tsx b/src/components/Tabs/TabsLabel.tsx
new file mode 100644
index 00000000..87c3ae9f
--- /dev/null
+++ b/src/components/Tabs/TabsLabel.tsx
@@ -0,0 +1,27 @@
+import { Label, Tooltip } from '@patternfly/react-core';
+import { PropsWithChildren } from 'react';
+
+import { IServiceContainer } from 'hooks/useServiceContainer';
+
+import { ServiceContainerLoading } from 'components/ServiceContainers/ServiceContainerLoading';
+
+import styles from './TabsLabel.module.css';
+
+interface ITabsLabelProps {
+  serviceContainer: IServiceContainer;
+  title: string;
+}
+
+export const TabsLabel = ({ serviceContainer, title, children }: PropsWithChildren<ITabsLabelProps>) => {
+  return (
+    <span className={styles['page-section-tabs-label']}>
+      <Tooltip content={title}>
+        <Label>
+          <ServiceContainerLoading loadingDelayMilliseconds={0} {...serviceContainer} variant="inline" title={title}>
+            {children}
+          </ServiceContainerLoading>
+        </Label>
+      </Tooltip>
+    </span>
+  );
+};