diff --git a/globals.php b/globals.php
index de80494..8dfc87e 100644
--- a/globals.php
+++ b/globals.php
@@ -20,7 +20,10 @@ function get_page_header(
   $newpoll_class = '';
   if ($api->isAuthenticated(false, true)) {
     $u = $api->getAuthorizedUser();
-    $greeting = 'Welcome, ' . ($u->name ?? '@'.$u->username);
+    $user_avatar_url = $u->getAvatarUrl(30);
+    $user_avatar_url_srcset = get_source_set($u, 30);
+    $avatar = '<img src="' . $user_avatar_url . '" class="avatar" srcset="' . $user_avatar_url_srcset . '"/>';
+    $greeting = $avatar . 'Welcome, ' . ($u->name ?? '@'.$u->username);
     $logout_link = '<a href="logout.php" class="logout">Logout</a>';
   } else {
     $newpoll_class = 'disabled';
diff --git a/styles/style.css b/styles/style.css
index 71efa27..a0f329e 100644
--- a/styles/style.css
+++ b/styles/style.css
@@ -107,6 +107,12 @@ header .newpolllink svg {
   stroke-width: 1em;
 }
 
+header .avatar {
+  width: 30px;
+  height: 30px;
+  margin-right: 4px;
+}
+
 /* Polls */
 .poll {
   display: inline-block;
@@ -154,9 +160,11 @@ datewrapper time {
 }
 .poll .header .user .avatar {
   width: 50px;
+  height: 50px;
 }
 .option-responses .avatar {
   width: 20px;
+  height: 20px;
 }
 
 /* Success banner */