diff --git a/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx b/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
index 89be7eeced..59b4a12402 100644
--- a/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
@@ -42,21 +42,21 @@ export function BasicTitle(props: BasicTitleProps) {
       {props.warningStateEntries.length > 0 ? (
         !props.hideWarnings ? (
           !props.showLibsWarnings ? (
-            <i
+            <span
               data-id="StaticAnalysisErrorCount"
               className={`badge ${
                 calculateWarningStateEntries(props.warningStateEntries).length >
                 0
                   ? "badge-warning"
                   : "badge-danger"
-              } rounded-circle ml-1 text-center`}
+              } badge-pill ml-1 px-1 text-center`}
             >
               {calculateWarningStateEntries(props.warningStateEntries).length}
-            </i>
+            </span>
           ) : (
-            <i className="badge badge-warning rounded-circle ml-1 text-center">
+            <span className="badge badge-warning rounded-circle ml-1 text-center">
               {warningCount}
-            </i>
+            </span>
           )
         ) : null
       ) : null}
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 1b0959f94c..e79c331c93 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -505,12 +505,12 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
           {hints.length > 0 ? (
             hideWarnings ? (
               <i className={`badge ${hints.filter(x => x.type === 'error').length > 0
-                ? `badge-danger` : 'badge-warning'} rounded-circle ml-1 text-center`}>
+                ? `badge-danger` : 'badge-warning'} badge-pill px-1 ml-1 text-center`}>
                 {hintErrors.length}
               </i>
             ) : (
               <i className={`badge ${hints.filter(x => x.type === 'error').length > 0
-              ? `badge-danger` : 'badge-warning'} rounded-circle ml-1 text-center`}>
+              ? `badge-danger` : 'badge-warning'} badge-pill px-1 ml-1 text-center`}>
                 {hints.length}
               </i>
             )
@@ -545,15 +545,15 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
           Slither
           {slitherWarnings.length > 0 ? (
             hideWarnings ? (
-              <i className="badge badge-warning rounded-circle ml-1">
+              <i className="badge badge-warning badge-pill px-1 ml-1">
                 {slitherErrors.length}
               </i>
             ) : showLibsWarning === true && hideWarnings === false ? (
-              <i className={`badge ${slitherErrors.length > 0 ? `badge-danger` : 'badge-warning'} rounded-circle ml-1 text-center`}>
+              <i className={`badge ${slitherErrors.length > 0 ? `badge-danger` : 'badge-warning'} badge-pill px-1 ml-1 text-center`}>
                   {slitherWarnings.length}
                 </i>
             )  : (
-              <i className={`badge ${slitherErrors.length > 0 ? `badge-danger` : 'badge-warning'} rounded-circle ml-1 text-center`}>
+              <i className={`badge ${slitherErrors.length > 0 ? `badge-danger` : 'badge-warning'} badge-pill px-1 ml-1 text-center`}>
                 {noLibSlitherWarnings.length}
               </i>
             )