diff --git a/changelog.d/roundup5.skip b/changelog.d/roundup5.skip
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/static/styles/Redmond DX.iss b/public/static/styles/Redmond DX.iss
index 08d9103ff..919be056b 100644
--- a/public/static/styles/Redmond DX.iss	
+++ b/public/static/styles/Redmond DX.iss	
@@ -129,6 +129,21 @@ PanelHeader {
   background: --fg
 }
 
+PanelHeader ButtonUnstyled Icon {
+  textColor: --text;
+  textAuto: 'no-preserve'
+}
+
+PanelHeader Button Icon {
+  textColor: --text;
+  textAuto: 'no-preserve'
+}
+
+PanelHeader Button Text {
+  textColor: --text;
+  textAuto: 'no-preserve'
+}
+
 Tab:hover {
   background: --bg;
   shadow: --buttonDefaultBevel
@@ -172,6 +187,14 @@ MenuItem:hover {
   background: --fg
 }
 
+MenuItem:active {
+  background: --fg
+}
+
+MenuItem:active:hover {
+  background: --fg
+}
+
 Popover {
   shadow: --buttonDefaultBevel, 5 5 0 0 #000000 / 0.2;
   roundness: 0
diff --git a/src/components/attachment/attachment.style.js b/src/components/attachment/attachment.style.js
index 45baa5546..a9455e367 100644
--- a/src/components/attachment/attachment.style.js
+++ b/src/components/attachment/attachment.style.js
@@ -15,7 +15,9 @@ export default {
     },
     {
       component: 'Button',
-      parent: { component: 'Attachment' },
+      parent: {
+        component: 'Attachment'
+      },
       directives: {
         background: '#FFFFFF',
         opacity: 0.5
diff --git a/src/components/button.style.js b/src/components/button.style.js
index 410d2f7e0..fb5d30b64 100644
--- a/src/components/button.style.js
+++ b/src/components/button.style.js
@@ -99,7 +99,7 @@ export default {
     {
       state: ['disabled'],
       directives: {
-        background: '$blend(--accent 0.25 --parent)',
+        background: '$blend(--inheritedBackground 0.25 --parent)',
         shadow: ['--buttonDefaultBevel']
       }
     },
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 0cd3d95a4..c8bba4c44 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -1,7 +1,7 @@
 <template>
   <label
     class="checkbox"
-    :class="{ disabled, indeterminate, 'indeterminate-fix': indeterminateTransitionFix }"
+    :class="[{ disabled, indeterminate, 'indeterminate-fix': indeterminateTransitionFix }, radio ? '-radio' : '-checkbox']"
   >
     <span
       v-if="!!$slots.before"
@@ -19,9 +19,9 @@
       @change="$emit('update:modelValue', $event.target.checked)"
     >
     <i
-      class="input -checkbox checkbox-indicator"
+      class="input checkbox-indicator"
       :aria-hidden="true"
-      :class="{ disabled }"
+      :class="[{ disabled }, radio ? '-radio' : '-checkbox']"
       @transitionend.capture="onTransitionEnd"
     />
     <span
@@ -37,6 +37,7 @@
 <script>
 export default {
   props: [
+    'radio',
     'modelValue',
     'indeterminate',
     'disabled'
@@ -107,6 +108,19 @@ export default {
     box-sizing: border-box;
   }
 
+  &.-radio {
+    .checkbox-indicator {
+      &,
+      &::before {
+        border-radius: 9999px;
+      }
+
+      &::before {
+        content: "•";
+      }
+    }
+  }
+
   .disabled {
     .checkbox-indicator::before {
       background-color: var(--background);
diff --git a/src/components/login_form/login_form.scss b/src/components/login_form/login_form.scss
new file mode 100644
index 000000000..83bc20fe4
--- /dev/null
+++ b/src/components/login_form/login_form.scss
@@ -0,0 +1,44 @@
+.login-panel {
+  .login-form {
+    display: flex;
+    flex-direction: column;
+    padding: 0.6em;
+  }
+
+  .btn {
+    min-height: 2em;
+    width: 10em;
+  }
+
+  .register {
+    flex: 1 1;
+  }
+
+  .login-bottom {
+    margin-top: 1em;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .form-group {
+    display: flex;
+    flex-direction: column;
+    padding: 0.3em 0.5em 0.6em;
+    line-height: 24px;
+  }
+
+  .login-error {
+    display: flex;
+    line-height: 2;
+    margin: 0.5em;
+    animation-name: shakeError;
+    animation-duration: 0.4s;
+    animation-timing-function: ease-in-out;
+  }
+
+  .error-message {
+    flex: 1;
+  }
+}
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index 25392742f..acf3e82bd 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="login panel panel-default">
+  <div class="login-panel panel panel-default">
     <!-- Default panel contents -->
 
     <div class="panel-heading">
@@ -70,14 +70,13 @@
           </div>
         </div>
       </form>
-    </div>
-
-    <div
-      v-if="error"
-      class="form-group"
-    >
-      <div class="alert error">
-        {{ error }}
+      <div
+        v-if="error"
+        class="login-error alert error"
+      >
+        <span class="error-message">
+          {{ error }}
+        </span>
         <button
           class="button-unstyled"
           @click="clearError"
@@ -94,57 +93,4 @@
 
 <script src="./login_form.js"></script>
 
-<style lang="scss">
-.login-form {
-  display: flex;
-  flex-direction: column;
-  padding: 0.6em;
-
-  .btn {
-    min-height: 2em;
-    width: 10em;
-  }
-
-  .register {
-    flex: 1 1;
-  }
-
-  .login-bottom {
-    margin-top: 1em;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  .form-group {
-    display: flex;
-    flex-direction: column;
-    padding: 0.3em 0.5em 0.6em;
-    line-height: 24px;
-  }
-
-  .form-bottom {
-    display: flex;
-    padding: 0.5em;
-    height: 32px;
-
-    button {
-      width: 10em;
-    }
-
-    p {
-      margin: 0.35em;
-      padding: 0.35em;
-      display: flex;
-    }
-  }
-
-  .error {
-    text-align: center;
-    animation-name: shakeError;
-    animation-duration: 0.4s;
-    animation-timing-function: ease-in-out;
-  }
-}
-</style>
+<style src="./login_form.scss"/>
diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
index 55bacee27..cb2436806 100644
--- a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
+++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
@@ -238,4 +238,4 @@
 
 <script src="./mrf_transparency_panel.js"></script>
 
-<style src="./mrf_transparency_panel.scss" lang="scss"/>
+<style src="./mrf_transparency_panel.scss" lang="scss" />
diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index 3384caec4..a1b7808f2 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -1,7 +1,7 @@
 import Timeago from 'components/timeago/timeago.vue'
 import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 import RichContent from 'components/rich_content/rich_content.jsx'
-import { forEach, map } from 'lodash'
+import Checkbox from 'components/checkbox/checkbox.vue'
 import { usePollsStore } from 'src/stores/polls'
 
 export default {
@@ -9,7 +9,8 @@ export default {
   props: ['basePoll', 'emoji'],
   components: {
     Timeago,
-    RichContent
+    RichContent,
+    Checkbox
   },
   data () {
     return {
@@ -44,6 +45,13 @@ export default {
     expired () {
       return (this.poll && this.poll.expired) || false
     },
+    expirationLabel () {
+      if (this.$store.getters.mergedConfig.useAbsoluteTimeFormat) {
+        return this.expired ? 'polls.expired_at' : 'polls.expires_at'
+      } else {
+        return this.expired ? 'polls.expired' : 'polls.expires_in'
+      }
+    },
     loggedIn () {
       return this.$store.state.users.currentUser
     },
@@ -78,26 +86,15 @@ export default {
     resultTitle (option) {
       return `${option.votes_count}/${this.totalVotesCount} ${this.$t('polls.votes')}`
     },
-    activateOption (index) {
-      // forgive me father: doing checking the radio/checkboxes
-      // in code because of customized input elements need either
-      // a) an extra element for the actual graphic, or b) use a
-      // pseudo element for the label. We use b) which mandates
-      // using "for" and "id" matching which isn't nice when the
-      // same poll appears multiple times on the site (notifs and
-      // timeline for example). With code we can make sure it just
-      // works without altering the pseudo element implementation.
-      const allElements = this.$el.querySelectorAll('input')
-      const clickedElement = this.$el.querySelector(`input[value="${index}"]`)
+    activateOption (index, value) {
+      let result
       if (this.poll.multiple) {
-        // Checkboxes, toggle only the clicked one
-        clickedElement.checked = !clickedElement.checked
+        result = this.choices || this.options.map(() => false)
       } else {
-        // Radio button, uncheck everything and check the clicked one
-        forEach(allElements, element => { element.checked = false })
-        clickedElement.checked = true
+        result = this.options.map(() => false)
       }
-      this.choices = map(allElements, e => e.checked)
+      result[index] = value
+      this.choices = result
     },
     optionId (index) {
       return `poll${this.poll.id}-${index}`
diff --git a/src/components/poll/poll.scss b/src/components/poll/poll.scss
new file mode 100644
index 000000000..d56358420
--- /dev/null
+++ b/src/components/poll/poll.scss
@@ -0,0 +1,62 @@
+.poll {
+  .votes {
+    display: flex;
+    flex-direction: column;
+    margin: 0 0 0.5em;
+  }
+
+  .poll-option {
+    margin: 0.75em 0.5em;
+
+    .input {
+      line-height: inherit;
+    }
+  }
+
+  .option-result {
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+    position: relative;
+    color: var(--textLight);
+  }
+
+  .option-result-label {
+    display: flex;
+    align-items: center;
+    padding: 0.1em 0.25em;
+    z-index: 1;
+    word-break: break-word;
+  }
+
+  .result-percentage {
+    width: 3.5em;
+    flex-shrink: 0;
+  }
+
+  .result-fill {
+    height: 100%;
+    position: absolute;
+    border-radius: var(--roundness);
+    top: 0;
+    left: 0;
+    transition: width 0.5s;
+  }
+
+  input {
+    width: 3.5em;
+  }
+
+  &.loading * {
+    cursor: progress;
+  }
+
+  .poll-vote-button {
+    padding: 0 1em;
+    margin-right: 0.5em;
+  }
+
+  .poll-checkbox {
+    display: none;
+  }
+}
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index faaba9921..24de14200 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -37,36 +37,56 @@
           :role="poll.multiple ? 'checkbox' : 'radio'"
           :aria-labelledby="`option-vote-${randomSeed}-${index}`"
           :aria-checked="choices[index]"
-          class="input unstyled"
-          @click="activateOption(index)"
         >
-          <!-- TODO: USE CHECKBOX -->
-          <input
-            v-if="poll.multiple"
-            type="checkbox"
-            class="input -checkbox poll-checkbox"
+          <Checkbox
+            :radio="!poll.multiple"
             :disabled="loading"
-            :value="index"
+            :model-value="choices[index]"
+            @update:model-value="value => activateOption(index, value)"
           >
-          <input
-            v-else
-            type="radio"
-            :disabled="loading"
-            :value="index"
-            class="input -radio"
-          >
-          <label class="option-vote">
             <RichContent
               :id="`option-vote-${randomSeed}-${index}`"
               :html="option.title_html"
               :handle-links="false"
               :emoji="emoji"
             />
-          </label>
+          </Checkbox>
         </div>
       </div>
     </div>
     <div class="footer faint">
+      <p>
+        <span
+          v-if="poll.pleroma?.non_anonymous"
+          :title="$t('polls.non_anonymous_title')"
+        >
+          {{ $t('polls.non_anonymous') }}
+          &nbsp;·&nbsp;
+        </span>
+        <span class="total">
+          <template v-if="typeof poll.voters_count === 'number'">
+            {{ $t("polls.people_voted_count", { count: poll.voters_count }, poll.voters_count) }}
+          </template>
+          <template v-else>
+            {{ $t("polls.votes_count", { count: poll.votes_count }, poll.votes_count) }}
+          </template>
+          <span v-if="expiresAt !== null">
+            &nbsp;·&nbsp;
+          </span>
+        </span>
+        <span v-if="expiresAt !== null">
+          <i18n-t
+            scope="global"
+            :keypath="expirationLabel"
+          >
+            <Timeago
+              :time="expiresAt"
+              :auto-update="60"
+              :now-threshold="0"
+            />
+          </i18n-t>
+        </span>
+      </p>
       <button
         v-if="!showResults"
         class="btn button-default poll-vote-button"
@@ -76,113 +96,10 @@
       >
         {{ $t('polls.vote') }}
       </button>
-      <span
-        v-if="poll.pleroma?.non_anonymous"
-        :title="$t('polls.non_anonymous_title')"
-      >
-        {{ $t('polls.non_anonymous') }}
-        &nbsp;·&nbsp;
-      </span>
-      <div class="total">
-        <template v-if="typeof poll.voters_count === 'number'">
-          {{ $t("polls.people_voted_count", { count: poll.voters_count }, poll.voters_count) }}
-        </template>
-        <template v-else>
-          {{ $t("polls.votes_count", { count: poll.votes_count }, poll.votes_count) }}
-        </template>
-        <span v-if="expiresAt !== null">
-          &nbsp;·&nbsp;
-        </span>
-      </div>
-      <span v-if="expiresAt !== null">
-        <i18n-t
-          scope="global"
-          :keypath="expired ? 'polls.expired' : 'polls.expires_in'"
-        >
-          <Timeago
-            :time="expiresAt"
-            :auto-update="60"
-            :now-threshold="0"
-          />
-        </i18n-t>
-      </span>
     </div>
   </div>
 </template>
 
 <script src="./poll.js"></script>
 
-<style lang="scss">
-.poll {
-  .votes {
-    display: flex;
-    flex-direction: column;
-    margin: 0 0 0.5em;
-  }
-
-  .poll-option {
-    margin: 0.75em 0.5em;
-
-    .input {
-      line-height: inherit;
-    }
-  }
-
-  .option-result {
-    height: 100%;
-    display: flex;
-    flex-direction: row;
-    position: relative;
-    color: var(--textLight);
-  }
-
-  .option-result-label {
-    display: flex;
-    align-items: center;
-    padding: 0.1em 0.25em;
-    z-index: 1;
-    word-break: break-word;
-  }
-
-  .result-percentage {
-    width: 3.5em;
-    flex-shrink: 0;
-  }
-
-  .result-fill {
-    height: 100%;
-    position: absolute;
-    border-radius: var(--roundness);
-    top: 0;
-    left: 0;
-    transition: width 0.5s;
-  }
-
-  .option-vote {
-    display: flex;
-    align-items: center;
-  }
-
-  input {
-    width: 3.5em;
-  }
-
-  .footer {
-    display: flex;
-    align-items: center;
-  }
-
-  &.loading * {
-    cursor: progress;
-  }
-
-  .poll-vote-button {
-    padding: 0 0.5em;
-    margin-right: 0.5em;
-  }
-
-  .poll-checkbox {
-    display: none;
-  }
-}
-</style>
+<style src="./poll.scss" lang="scss" />
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index 00e700cfb..645a6fce8 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -119,10 +119,13 @@
           :key="hashtag.url"
           class="status trend search-result"
         >
-          <div class="hashtag">
-            <router-link :to="{ name: 'tag-timeline', params: { tag: hashtag.name } }">
+          <router-link
+            class="list-item hashtag"
+            :to="{ name: 'tag-timeline', params: { tag: hashtag.name } }"
+          >
+            <span class="name">
               #{{ hashtag.name }}
-            </router-link>
+            </span>
             <div v-if="lastHistoryRecord(hashtag)">
               <span v-if="lastHistoryRecord(hashtag).accounts == 1">
                 {{ $t('search.person_talking', { count: lastHistoryRecord(hashtag).accounts }) }}
@@ -131,7 +134,7 @@
                 {{ $t('search.people_talking', { count: lastHistoryRecord(hashtag).accounts }) }}
               </span>
             </div>
-          </div>
+          </router-link>
           <div
             v-if="lastHistoryRecord(hashtag)"
             class="count"
@@ -199,10 +202,13 @@
 
   .hashtag {
     flex: 1 1 auto;
-    color: var(--text);
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+
+    .name {
+      color: var(--link);
+    }
   }
 
   .count {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index e78b0931a..d0af91aef 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -540,6 +540,7 @@
             :status="status"
             :replying="replying"
             @toggle-replying="toggleReplying"
+            @interacted="e => $emit('interacted')"
           />
         </div>
       </div>
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 87c5bb1e5..07affaafe 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -67,6 +67,9 @@ export default {
     'doAction',
     'outerClose'
   ],
+  emits: [
+    'interacted'
+  ],
   components: {
     StatusBookmarkFolderMenu,
     EmojiPicker,
@@ -120,7 +123,8 @@ export default {
         this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
     },
-    doActionWrap (button, close) {
+    doActionWrap (button, close = () => {}) {
+      this.$emit('interacted')
       if (button.name === 'emoji') {
         this.$refs.picker.showPicker()
       } else {
diff --git a/src/components/status_action_buttons/action_button_container.js b/src/components/status_action_buttons/action_button_container.js
index bd91b9404..313e3022f 100644
--- a/src/components/status_action_buttons/action_button_container.js
+++ b/src/components/status_action_buttons/action_button_container.js
@@ -22,6 +22,7 @@ export default {
     MuteConfirm
   },
   props: ['button', 'status'],
+  emits: ['interacted'],
   mounted () {
     if (this.button.name === 'mute') {
       this.$store.dispatch('fetchDomainMutes')
diff --git a/src/components/status_action_buttons/action_button_container.vue b/src/components/status_action_buttons/action_button_container.vue
index deada02ae..931a40349 100644
--- a/src/components/status_action_buttons/action_button_container.vue
+++ b/src/components/status_action_buttons/action_button_container.vue
@@ -79,6 +79,7 @@
       :button="button"
       :status="status"
       v-bind="$attrs"
+      @interacted="e => $emit('interacted')"
     />
     <teleport to="#modal">
       <MuteConfirm
diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js
index ff7944268..ecd4def70 100644
--- a/src/components/status_action_buttons/buttons_definitions.js
+++ b/src/components/status_action_buttons/buttons_definitions.js
@@ -1,4 +1,7 @@
 import { useEditStatusStore } from 'src/stores/editStatus.js'
+import { useReportsStore } from 'src/stores/reports.js'
+import { useStatusHistoryStore } from 'src/stores/statusHistory.js'
+
 const PRIVATE_SCOPES = new Set(['private', 'direct'])
 const PUBLIC_SCOPES = new Set(['public', 'unlisted'])
 export const BUTTONS = [{
@@ -138,6 +141,34 @@ export const BUTTONS = [{
       return dispatch('bookmark', { id: status.id })
     }
   }
+}, {
+  // =========
+  // EDIT HISTORY
+  // =========
+  name: 'editHistory',
+  icon: 'history',
+  label: 'status.status_history',
+  if ({ status, state }) {
+    return state.instance.editingAvailable &&
+      status.edited_at !== null
+  },
+  action ({ status }) {
+    const originalStatus = { ...status }
+    const stripFieldsList = [
+      'attachments',
+      'created_at',
+      'emojis',
+      'text',
+      'raw_html',
+      'nsfw',
+      'poll',
+      'summary',
+      'summary_raw_html'
+    ]
+    stripFieldsList.forEach(p => delete originalStatus[p])
+    useStatusHistoryStore().openStatusHistoryModal(originalStatus)
+    return Promise.resolve()
+  }
 }, {
   // =========
   // EDIT
@@ -216,8 +247,8 @@ export const BUTTONS = [{
   icon: 'flag',
   label: 'user_card.report',
   if: ({ loggedIn }) => loggedIn,
-  action ({ dispatch, status }) {
-    dispatch('openUserReportingModal', { userId: status.user.id, statusIds: [status.id] })
+  action ({ status }) {
+    return useReportsStore().openUserReportingModal({ userId: status.user.id, statusIds: [status.id] })
   }
 }].map(button => {
   return Object.fromEntries(
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index 622f21ca5..6d4e4fbc0 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -18,7 +18,7 @@ library.add(
 
 const StatusActionButtons = {
   props: ['status', 'replying'],
-  emits: ['toggleReplying'],
+  emits: ['toggleReplying', 'interacted'],
   data () {
     return {
       showPin: false,
diff --git a/src/components/status_action_buttons/status_action_buttons.scss b/src/components/status_action_buttons/status_action_buttons.scss
index 78fd7c33d..23b86e5bd 100644
--- a/src/components/status_action_buttons/status_action_buttons.scss
+++ b/src/components/status_action_buttons/status_action_buttons.scss
@@ -3,7 +3,7 @@
 .StatusActionButtons {
   .quick-action-buttons {
     display: grid;
-    grid-template-columns: repeat(auto-fill, 4em);
+    grid-template-columns: repeat(auto-fill, minmax(10%, 3em));
     grid-auto-flow: row dense;
     grid-auto-rows: 1fr;
     grid-gap: 1.25em 1em;
diff --git a/src/components/status_action_buttons/status_action_buttons.vue b/src/components/status_action_buttons/status_action_buttons.vue
index 6d5cd190c..40884425c 100644
--- a/src/components/status_action_buttons/status_action_buttons.vue
+++ b/src/components/status_action_buttons/status_action_buttons.vue
@@ -17,6 +17,7 @@
           :get-component="getComponent"
           :close="() => {}"
           :do-action="doAction"
+          @interacted="e => $emit('interacted')"
         />
         <button
           v-if="showPin && currentUser"
@@ -86,8 +87,9 @@
                 :func-arg="funcArg"
                 :get-class="getClass"
                 :get-component="getComponent"
-                :outerClose="close"
+                :outer-close="close"
                 :do-action="doAction"
+                @interacted="e => $emit('interacted')"
               />
               <button
                 v-if="showPin && currentUser"
diff --git a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue
index e210fdaf1..31478501b 100644
--- a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue
+++ b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue
@@ -14,7 +14,10 @@
           class="input menu-checkbox -radio"
           :class="{ 'menu-checkbox-checked': status.bookmark_folder_id == folder.id }"
         />
-        <StillImage :src="folder.emoji_url" class="emoji" />
+        <StillImage
+          :src="folder.emoji_url"
+          class="emoji"
+        />
         {{ ' ' + folder.name }}
       </button>
     </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 545cdb1e1..d4585805b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -231,8 +231,9 @@
     "single_choice": "Single choice",
     "multiple_choices": "Multiple choices",
     "expiry": "Poll age",
-    "expires_in": "Poll ends in {0}",
+    "expires_at": "Poll ends {0}",
     "expired": "Poll ended {0} ago",
+    "expired_at": "Poll ended {0}",
     "not_enough_options": "Too few unique options in poll",
     "non_anonymous": "Public poll",
     "non_anonymous_title": "Other instances may display the options you voted for"
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index 691edc280..320196493 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -516,7 +516,7 @@ export const init = ({
         .filter(c => virtualComponents.has(c) && !nonEditableComponents.has(c))
     } else if (liteMode) {
       validInnerComponents = (component.validInnerComponentsLite || component.validInnerComponents || [])
-    } else if (component.name === 'Root') {
+    } else if (component.name === 'Root' || component.states != null) {
       validInnerComponents = component.validInnerComponents || []
     } else {
       validInnerComponents = component
diff --git a/src/stores/reports.js b/src/stores/reports.js
index a84442eca..18080d4e7 100644
--- a/src/stores/reports.js
+++ b/src/stores/reports.js
@@ -32,7 +32,7 @@ export const useReportsStore = defineStore('reports', {
       this.reportModal.activated = false
     },
     setReportState ({ id, state }) {
-      const oldState = window.vuex.state.reports.reports[id].state
+      const oldState = this.reports[id].state
       this.reports[id].state = state
       window.vuex.state.api.backendInteractor.setReportState({ id, state }).catch(e => {
         console.error('Failed to set report state', e)
diff --git a/tools/emoji_merger.js b/tools/emoji_merger.js
index 78a798dfe..4d3039612 100644
--- a/tools/emoji_merger.js
+++ b/tools/emoji_merger.js
@@ -9,7 +9,7 @@
 */
 
 // Existing emojis we have
-const oldEmojiFilename = '../static/emoji.json'
+const oldEmojiFilename = '../src/assets/emoji.json'
 
 // The file downloaded from https://gist.github.com/oliveratgithub/0bf11a9aff0d6da7b46f1490f86a71eb
 const newEmojiFilename = 'emojis.json'