diff --git a/src/components/Avatar/Avatar.module.scss b/src/components/Avatar/Avatar.module.scss
index d41e87e..26ae5ad 100644
--- a/src/components/Avatar/Avatar.module.scss
+++ b/src/components/Avatar/Avatar.module.scss
@@ -31,7 +31,6 @@
   bottom: 0px;
   width: 15px;
   height: 15px;
-  background-color: var(--background-site);
   border-radius: 50%;
 }
 
@@ -98,8 +97,6 @@
 
   .iconBackground {
     @include iconBackground;
-    bottom: 0px;
-    right: 0px;
   }
 }
 
@@ -115,8 +112,6 @@
 
   .iconBackground {
     @include iconBackground;
-    bottom: 0px;
-    right: 0px;
   }
 }
 
@@ -132,8 +127,6 @@
 
   .iconBackground {
     @include iconBackground;
-    bottom: 0px;
-    right: 0px;
   }
 }
 
diff --git a/src/components/Avatar/Avatar.tsx b/src/components/Avatar/Avatar.tsx
index df526b2..90b6d2d 100644
--- a/src/components/Avatar/Avatar.tsx
+++ b/src/components/Avatar/Avatar.tsx
@@ -2,14 +2,15 @@ import { Component, createMemo, createSignal, Show } from 'solid-js';
 import defaultAvatar from '../../assets/icons/default_nostrich.svg';
 import { useMediaContext } from '../../contexts/MediaContext';
 import { getMediaUrl } from '../../lib/media';
-import { MediaSize } from '../../types/primal';
+import { MediaSize, PrimalUser } from '../../types/primal';
+import VerificationCheck from '../VerificationCheck/VerificationCheck';
 
 import styles from './Avatar.module.scss';
 
 const Avatar: Component<{
   src: string | undefined,
   size?: "xxs" | "xss" | "xs" | "vs" | "sm" | "md" | "lg" | "xl" | "xxl",
-  verified?: string,
+  user?: PrimalUser,
   highlightBorder?: boolean,
 }> = (props) => {
 
@@ -109,9 +110,9 @@ const Avatar: Component<{
           <img src={imageSrc()} alt="avatar" onerror={imgError}/>
         </div>
       </Show>
-      <Show when={props.verified}>
+      <Show when={props.user}>
         <div class={styles.iconBackground}>
-          <div class={styles.verifiedIcon}></div>
+          <VerificationCheck user={props.user} />
         </div>
       </Show>
     </div>
diff --git a/src/components/NewNote/NewNote.tsx b/src/components/NewNote/NewNote.tsx
index 0e9df56..504a449 100644
--- a/src/components/NewNote/NewNote.tsx
+++ b/src/components/NewNote/NewNote.tsx
@@ -20,7 +20,7 @@ const NewNote: Component<{ onSuccess: (note: SendNoteResult) => void}> = (props)
               <Avatar
                 src={activeUser()?.picture}
                 size="md"
-                verified={activeUser()?.nip05}
+                user={activeUser()}
               />
             </div>
             <div class={styles.rightSide}>
diff --git a/src/components/Note/NoteHeader/NoteHeader.module.scss b/src/components/Note/NoteHeader/NoteHeader.module.scss
index 9ffcdee..8b7e985 100644
--- a/src/components/Note/NoteHeader/NoteHeader.module.scss
+++ b/src/components/Note/NoteHeader/NoteHeader.module.scss
@@ -55,6 +55,7 @@
         overflow: hidden;
         max-width: 360px;
         color: var(--text-primary);
+        margin-right: 2px;
       }
       .time{
         margin: 0px 2px;
diff --git a/src/components/PeopleList/PeopleList.tsx b/src/components/PeopleList/PeopleList.tsx
index 61a72b0..785026a 100644
--- a/src/components/PeopleList/PeopleList.tsx
+++ b/src/components/PeopleList/PeopleList.tsx
@@ -23,7 +23,7 @@ const PeopleList: Component<{ people: PrimalUser[], label: string}> = (props) =>
                   <Avatar
                     src={person?.picture}
                     size="md"
-                    verified={person?.nip05}
+                    user={person}
                   />
                 </div>
                 <div class={styles.content}>
diff --git a/src/components/ProfileWidget/ProfileWidget.tsx b/src/components/ProfileWidget/ProfileWidget.tsx
index 2e2ebda..8060d98 100644
--- a/src/components/ProfileWidget/ProfileWidget.tsx
+++ b/src/components/ProfileWidget/ProfileWidget.tsx
@@ -21,7 +21,7 @@ const ProfileWidget: Component = () => {
             <Avatar
               size="vs"
               src={activeUser()?.picture}
-              verified={activeUser()?.nip05}
+              user={activeUser()}
             />
           </div>
           <div class={styles.userInfo}>
diff --git a/src/components/ReplyToNote/ReplyToNote.tsx b/src/components/ReplyToNote/ReplyToNote.tsx
index 2610c86..baafa6d 100644
--- a/src/components/ReplyToNote/ReplyToNote.tsx
+++ b/src/components/ReplyToNote/ReplyToNote.tsx
@@ -89,7 +89,7 @@ const ReplyToNote: Component<{ note: PrimalNote, onNotePosted?: (note: SendNoteR
             <Avatar
               src={activeUser()?.picture}
               size="md"
-              verified={activeUser()?.nip05}
+              user={activeUser()}
             />
           </div>
           <div class={styles.rightSideClosed}>
@@ -117,7 +117,7 @@ const ReplyToNote: Component<{ note: PrimalNote, onNotePosted?: (note: SendNoteR
             <Avatar
               src={activeUser()?.picture}
               size="md"
-              verified={activeUser()?.nip05}
+              user={activeUser()}
             />
           </div>
           <div class={styles.rightSide}>
diff --git a/src/components/VerificationCheck/VerificationCheck.module.scss b/src/components/VerificationCheck/VerificationCheck.module.scss
index 94a090c..fbb739d 100644
--- a/src/components/VerificationCheck/VerificationCheck.module.scss
+++ b/src/components/VerificationCheck/VerificationCheck.module.scss
@@ -3,7 +3,6 @@
   width: 100%;
   height: 100%;
   display: inline-block;
-  margin-inline: 2px;
   background-color: var(--text-tertiary-2);
   -webkit-mask: url(../../assets/icons/verified.svg) no-repeat 0 / 100%;
   mask: url(../../assets/icons/verified.svg) no-repeat 0 / 100%;
@@ -12,15 +11,15 @@
 .verificationIcon {
   width: 15px;
   height: 15px;
-  display: inline-block;
   position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 .verifiedIconPrimal {
   width: 100%;
   height: 100%;
-  display: inline-block;
-  margin-inline: 2px;
   background: var(--brand-gradient);
   -webkit-mask: url(../../assets/icons/verified.svg) no-repeat 0 / 100%;
   mask: url(../../assets/icons/verified.svg) no-repeat 0 / 100%;
@@ -31,7 +30,8 @@
   height: 11px;
   position: absolute;
   top: 2px;
-  left: 4px;
+  left: 2px;
   border-radius: 50%;
   background-color: white;
+  position: absolute;
 }
diff --git a/src/components/VerificationCheck/VerificationCheck.tsx b/src/components/VerificationCheck/VerificationCheck.tsx
index 426fd2c..de6b12a 100644
--- a/src/components/VerificationCheck/VerificationCheck.tsx
+++ b/src/components/VerificationCheck/VerificationCheck.tsx
@@ -32,7 +32,13 @@ const VerificationCheck: Component<{ user: PrimalUser | undefined }> = (props) =
   })
 
   return (
-    <Show when={isVerified()}>
+    <Show
+      when={isVerified()}
+      fallback={
+        <div class={styles.verificationIcon}>
+        </div>
+      }
+    >
       <Show
         when={isVerifiedByPrimal()}
         fallback={