diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/empty-analysis-message/styles.module.scss b/redisinsight/ui/src/pages/databaseAnalysis/components/empty-analysis-message/styles.module.scss
index ae1d7ecc60..4b8e8f238c 100644
--- a/redisinsight/ui/src/pages/databaseAnalysis/components/empty-analysis-message/styles.module.scss
+++ b/redisinsight/ui/src/pages/databaseAnalysis/components/empty-analysis-message/styles.module.scss
@@ -19,7 +19,7 @@
   margin: auto;
 
   .title {
-    font: normal normal 500 18px/24px Graphik !important;
+    font: normal normal 500 18px/24px Graphik, sans-serif !important;
     padding-bottom: 12px;
   }
 
diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/Table.tsx b/redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/Table.tsx
index 9999051a05..f5eff4bf17 100644
--- a/redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/Table.tsx
+++ b/redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/Table.tsx
@@ -77,7 +77,6 @@ const Table = (props: Props) => {
       width: '10%',
       align: 'left',
       sortable: true,
-      className: 'dataType',
       render: (type: string) => (
         <div className={styles.badgesContainer}>
           <GroupBadge key={type} type={type} className={styles.badge} />
@@ -99,6 +98,7 @@ const Table = (props: Props) => {
         return (
           <div data-testid="top-keys-table-name" className={cx(styles.delimiter, 'truncateText')}>
             <EuiToolTip
+              title="Key Name"
               anchorClassName={styles.tooltip}
               position="bottom"
               content={tooltipContent}
diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/styles.module.scss b/redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/styles.module.scss
index fb6c9fbba0..4f24f5bf7c 100644
--- a/redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/styles.module.scss
+++ b/redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/styles.module.scss
@@ -17,7 +17,7 @@
   }
 
   :global(.euiButton__text) {
-    font: normal normal normal 13px/18px Graphik !important;
+    font: normal normal normal 13px/17px Graphik, sans-serif !important;
   }
 
   &.activeBtn:global(.euiButton.euiButton-isDisabled.euiButton--fill.euiButton--secondary),
@@ -99,7 +99,7 @@
         }
 
         .euiTableCellContent__text {
-          font: normal normal normal 12px/18px Graphik, sans-serif;
+          font: normal normal normal 12px/17px Graphik, sans-serif;
         }
       }
 
@@ -111,11 +111,7 @@
 
     .euiTableRowCell .euiTableCellContent {
       padding: 10px;
-      font: normal normal normal 14px/24px Graphik;
-
-      &:global(.dataType) {
-        padding: 10px 6px 2px;
-      }
+      font: normal normal normal 14px/17px Graphik, sans-serif;
     }
 
     .euiTableHeaderButton.euiTableHeaderButton-isSorted {
@@ -130,7 +126,7 @@
   }
 
   .valueUnit {
-    font: normal normal normal 12px/18px Graphik, sans-serif !important;
+    font: normal normal normal 12px/17px Graphik, sans-serif !important;
     margin-left: 4px;
     color: var(--euiColorMediumShade) !important;
   }
@@ -151,7 +147,7 @@
 :global(.euiTableCellContent) .delimiter span {
   cursor: pointer;
   color: var(--buttonSecondaryTextColor);
-  font: normal normal normal 13px/18px Graphik;
+  font: normal normal normal 13px/17px Graphik, sans-serif;
 
   &:hover {
     text-decoration: underline;
@@ -160,19 +156,15 @@
 
 :global(.euiTableCellContent) .count {
   color: var(--euiTextSubduedColor);
-  font: normal normal 500 16px/18px Inconsolata;
+  font: normal normal 500 16px/17px Inconsolata;
 }
 
 .badgesContainer {
   display: flex;
   flex-wrap: wrap;
 
-  & .badge {
-    margin: 0 7px 8px;
-  }
-
   :global(.euiBadge) span {
-    font: normal normal normal 12px/16px Graphik;
+    font: normal normal normal 12px/16px Graphik, sans-serif;
     padding-top: 0 !important;
   }
 }
@@ -196,7 +188,7 @@
   }
 
   :global(.euiButtonEmpty__content.euiButtonContent .euiButtonEmpty__text) {
-    font: normal normal normal 13px/18px Graphik;
+    font: normal normal normal 13px/17px Graphik, sans-serif;
     color: var(--buttonSecondaryTextColor) !important;
   }
 
diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/Table.tsx b/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/Table.tsx
index 3e5ab9023f..262bbe1b28 100644
--- a/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/Table.tsx
+++ b/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/Table.tsx
@@ -71,6 +71,7 @@ const NameSpacesTable = (props: Props) => {
               <div className={styles.expanded} key={type.type} data-testid={`expanded-${item.nsp}-${index}`}>
                 <div className="truncateText">
                   <EuiToolTip
+                    title="Key Pattern"
                     anchorClassName={styles.tooltip}
                     position="bottom"
                     content={`${item.nsp}:*`}
@@ -83,7 +84,7 @@ const NameSpacesTable = (props: Props) => {
                     </EuiButtonEmpty>
                   </EuiToolTip>
                 </div>
-                <div><GroupBadge type={type.type} /></div>
+                <div className={styles.badgesContainer}><GroupBadge type={type.type} /></div>
                 <div className={styles.rightAlign}>
                   <span className={styles.count} data-testid="usedMemory-value">
                     {number}
@@ -123,6 +124,7 @@ const NameSpacesTable = (props: Props) => {
         return (
           <div className={cx(styles.delimiter, 'truncateText')}>
             <EuiToolTip
+              title="Key Pattern"
               anchorClassName={styles.tooltip}
               position="bottom"
               content={tooltipContent}
diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/styles.module.scss b/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/styles.module.scss
index 8d5af5b5da..82835a7a89 100644
--- a/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/styles.module.scss
+++ b/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/styles.module.scss
@@ -20,7 +20,7 @@
     }
   
     :global(.euiButton__text) {
-      font: normal normal normal 13px/18px Graphik !important;
+      font: normal normal normal 13px/17px Graphik, sans-serif !important;
     }
   
     &.activeBtn:global(.euiButton.euiButton-isDisabled.euiButton--fill.euiButton--secondary),
@@ -54,7 +54,7 @@
     }
   
     :global(.euiButtonEmpty__content.euiButtonContent .euiButtonEmpty__text) {
-      font: normal normal normal 13px/18px Graphik;
+      font: normal normal normal 13px/17px Graphik, sans-serif;
       color: var(--buttonSecondaryTextColor) !important;
     }
   
@@ -64,7 +64,7 @@
     }
   
     &.expanded {
-      padding-left: 12px;
+      padding: 0 20px 0 12px;
     }
   
     &.expanded :global(.euiButtonEmpty__content.euiButtonContent  .euiButtonEmpty__text) {
@@ -147,7 +147,7 @@
         }
 
         .euiTableCellContent__text {
-          font: normal normal normal 12px/18px Graphik, sans-serif;
+          font: normal normal normal 12px/17px Graphik, sans-serif;
         }
       }
 
@@ -163,7 +163,7 @@
 
     .euiTableCellContent {
       padding: 10px;
-      font: normal normal normal 14px/24px Graphik;
+      font: normal normal normal 14px/24px Graphik, sans-serif;
 
       &:global(.dataType) {
         padding: 10px 6px 2px;
@@ -182,7 +182,7 @@
   }
 
   .valueUnit {
-    font: normal normal normal 12px/18px Graphik, sans-serif !important;
+    font: normal normal normal 12px/17px Graphik, sans-serif !important;
     margin-left: 4px;
     color: var(--euiColorMediumShade) !important;
   }
@@ -197,7 +197,7 @@
 
 .expanded {
   display: grid;
-  grid-template-columns: auto calc(32%) calc(13% + 6px) calc(11% + 22px);
+  grid-template-columns: auto calc(32%) calc(13% + 10px) calc(11% + 22px);
   grid-column-gap: 0;
   height: 42px;
   width: 100%;
@@ -228,7 +228,7 @@
 :global(.euiTableCellContent) .delimiter span {
   cursor: pointer;
   color: var(--buttonSecondaryTextColor);
-  font: normal normal normal 13px/18px Graphik;
+  font: normal normal normal 13px/17px Graphik, sans-serif;
 
   &:hover {
     text-decoration: underline;
@@ -237,7 +237,7 @@
 
 :global(.euiTableCellContent) .count {
   color: var(--euiTextSubduedColor);
-  font: normal normal 500 16px/18px Inconsolata;
+  font: normal normal 500 16px/17px Inconsolata;
 }
 
 .badgesContainer {
@@ -253,7 +253,7 @@
   }
 
   :global(.euiBadge) span {
-    font: normal normal normal 12px/16px Graphik;
+    font: normal normal normal 12px/16px Graphik, sans-serif;
     padding-top: 0 !important;
   }
 }