diff --git a/bin/svgs.js b/bin/svgs.js
index 4f322b6b..af69d1b8 100644
--- a/bin/svgs.js
+++ b/bin/svgs.js
@@ -46,5 +46,6 @@ module.exports = [
   { id: 'fa-search-plus', src: 'src/thirdparty/font-awesome-svg-png/white/svg/search-plus.svg' },
   { id: 'fa-share-square-o', src: 'src/thirdparty/font-awesome-svg-png/white/svg/share-square-o.svg' },
   { id: 'fa-flag', src: 'src/thirdparty/font-awesome-svg-png/white/svg/flag.svg' },
-  { id: 'fa-suitcase', src: 'src/thirdparty/font-awesome-svg-png/white/svg/suitcase.svg' }
+  { id: 'fa-suitcase', src: 'src/thirdparty/font-awesome-svg-png/white/svg/suitcase.svg' },
+  { id: 'fa-bar-chart', src: 'src/thirdparty/font-awesome-svg-png/white/svg/bar-chart.svg' }
 ]
diff --git a/src/routes/_components/status/Status.html b/src/routes/_components/status/Status.html
index c9c4f75e..10e53f42 100644
--- a/src/routes/_components/status/Status.html
+++ b/src/routes/_components/status/Status.html
@@ -268,8 +268,8 @@
         originalStatus.card &&
         originalStatus.card.title
       ),
-      showPoll: ({ originalStatus, isStatusInNotification }) => (
-        !isStatusInNotification && originalStatus.poll
+      showPoll: ({ originalStatus }) => (
+        originalStatus.poll
       ),
       showMedia: ({ originalStatus, isStatusInNotification }) => (
         !isStatusInNotification &&
@@ -292,7 +292,7 @@
           reblog, notification, visibility, $omitEmojiInDisplayNames, $disableLongAriaLabels)
       ),
       showHeader: ({ notification, status, timelineType }) => (
-        (notification && (notification.type === 'reblog' || notification.type === 'favourite')) ||
+        (notification && ['reblog', 'favourite', 'poll'].includes(notification.type)) ||
         status.reblog ||
         timelineType === 'pinned'
       ),
diff --git a/src/routes/_components/status/StatusHeader.html b/src/routes/_components/status/StatusHeader.html
index fabea6e1..2708556a 100644
--- a/src/routes/_components/status/StatusHeader.html
+++ b/src/routes/_components/status/StatusHeader.html
@@ -1,5 +1,5 @@
-<div class="status-header {isStatusInNotification ? 'status-in-notification' : ''} {notification && notification.type === 'follow' ? 'header-is-follow' : ''}">
-  <div class="status-header-avatar {timelineType === 'pinned' ? 'hidden' : ''}">
+<div class="status-header {isStatusInNotification ? 'status-in-notification' : ''} {notificationType === 'follow' ? 'header-is-follow' : ''}">
+  <div class="status-header-avatar {timelineType === 'pinned' || notificationType === 'poll' ? 'hidden' : ''}">
     <Avatar {account} size="extra-small"/>
   </div>
   <SvgIcon className="status-header-svg" href={icon} />
@@ -9,7 +9,7 @@
       <span class="status-header-author">
         Pinned toot
       </span>
-    {:else}
+    {:elseif notificationType !== 'poll'}
       <a id={elementId}
          href="/accounts/{accountId}"
          rel="prefetch"
@@ -20,17 +20,7 @@
       </a>
     {/if}
 
-    <span class="status-header-action">
-        {#if notification && notification.type === 'reblog'}
-          boosted your status
-        {:elseif notification && notification.type === 'favourite'}
-          favorited your status
-        {:elseif notification && notification.type === 'follow'}
-          followed you
-        {:elseif status && status.reblog}
-          boosted
-        {/if}
-    </span>
+    <span class="status-header-action">{actionText}</span>
   </div>
 </div>
 <style>
@@ -105,6 +95,7 @@
   import Avatar from '../Avatar.html'
   import AccountDisplayName from '../profile/AccountDisplayName.html'
   import SvgIcon from '../SvgIcon.html'
+  import { store } from '../../_store/store'
 
   export default {
     components: {
@@ -112,17 +103,40 @@
       AccountDisplayName,
       SvgIcon
     },
+    store: () => store,
     computed: {
       elementId: ({ uuid }) => `status-header-${uuid}`,
-      icon: ({ notification, status, timelineType }) => {
+      notificationType: ({ notification }) => notification && notification.type,
+      icon: ({ notificationType, status, timelineType }) => {
         if (timelineType === 'pinned') {
           return '#fa-thumb-tack'
-        } else if ((notification && notification.type === 'reblog') || (status && status.reblog)) {
+        } else if ((notificationType === 'reblog') || (status && status.reblog)) {
           return '#fa-retweet'
-        } else if (notification && notification.type === 'follow') {
+        } else if (notificationType === 'follow') {
           return '#fa-user-plus'
+        } else if (notificationType === 'poll') {
+          return '#fa-bar-chart'
         }
         return '#fa-star'
+      },
+      actionText: ({ notificationType, status, $currentVerifyCredentials }) => {
+        if (notificationType === 'reblog') {
+          return 'boosted your status'
+        } else if (notificationType === 'favourite') {
+          return 'favorited your status'
+        } else if (notificationType === 'follow') {
+          return 'followed you'
+        } else if (notificationType === 'poll') {
+          if ($currentVerifyCredentials && status && $currentVerifyCredentials.id === status.account.id) {
+            return 'A poll you created has ended'
+          } else {
+            return 'A poll you voted on has ended'
+          }
+        } else if (status && status.reblog) {
+          return 'boosted'
+        } else {
+          return ''
+        }
       }
     }
   }