diff --git a/changelog.d/backend-repo-url.skip b/changelog.d/backend-repo-url.skip
deleted file mode 100644
index e69de29bb..000000000
diff --git a/changelog.d/checkbox.fix b/changelog.d/checkbox.fix
deleted file mode 100644
index 6a947ec8e..000000000
--- a/changelog.d/checkbox.fix
+++ /dev/null
@@ -1 +0,0 @@
-checkbox vertical alignment has been fixed
diff --git a/changelog.d/deprecate-subscribe.change b/changelog.d/deprecate-subscribe.change
deleted file mode 100644
index 10fb34f46..000000000
--- a/changelog.d/deprecate-subscribe.change
+++ /dev/null
@@ -1 +0,0 @@
-Use /api/v1/accounts/:id/follow for account subscriptions instead of the deprecated routes
\ No newline at end of file
diff --git a/changelog.d/emoji-size.fix b/changelog.d/emoji-size.fix
deleted file mode 100644
index a1189b833..000000000
--- a/changelog.d/emoji-size.fix
+++ /dev/null
@@ -1 +0,0 @@
-fix emoji inconsistencies in notifications, fix some emoji not scaling with interface
diff --git a/changelog.d/misc-markup.fix b/changelog.d/misc-markup.fix
deleted file mode 100644
index 7af934a29..000000000
--- a/changelog.d/misc-markup.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix small markup inconsistencies
diff --git a/changelog.d/panel-stack.fix b/changelog.d/panel-stack.fix
deleted file mode 100644
index 518ff32fe..000000000
--- a/changelog.d/panel-stack.fix
+++ /dev/null
@@ -1 +0,0 @@
-proper sticky header for conversations on user page
diff --git a/changelog.d/quote-buttons.fix b/changelog.d/quote-buttons.fix
deleted file mode 100644
index 859e5d6c5..000000000
--- a/changelog.d/quote-buttons.fix
+++ /dev/null
@@ -1 +0,0 @@
-reply-or-quote buttons now take less space
diff --git a/changelog.d/show-bookmarks-on-mobile.fix b/changelog.d/show-bookmarks-on-mobile.fix
deleted file mode 100644
index 3b5db4834..000000000
--- a/changelog.d/show-bookmarks-on-mobile.fix
+++ /dev/null
@@ -1 +0,0 @@
-Bookmarks visible again on mobile
diff --git a/changelog.d/splashfix.skip b/changelog.d/splashfix.skip
deleted file mode 100644
index e69de29bb..000000000
diff --git a/changelog.d/user-link.add b/changelog.d/user-link.add
deleted file mode 100644
index ca65aa5fa..000000000
--- a/changelog.d/user-link.add
+++ /dev/null
@@ -1 +0,0 @@
-Make UserLink wrappable
diff --git a/changelog.d/weird-absolute-time-format.fix b/changelog.d/weird-absolute-time-format.fix
deleted file mode 100644
index 727d58764..000000000
--- a/changelog.d/weird-absolute-time-format.fix
+++ /dev/null
@@ -1 +0,0 @@
-Show only month and day instead of weird "day, hour" format. While at it, fixed typo "defualt" in a comment.
\ No newline at end of file
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 65a151785..6153608e1 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -243,7 +243,7 @@ const resolveStaffAccounts = ({ store, accounts }) => {
 
 const getNodeInfo = async ({ store }) => {
   try {
-    const res = await preloadFetch('/nodeinfo/2.1.json')
+    const res = await preloadFetch('/nodeinfo/2.0.json')
     if (res.ok) {
       const data = await res.json()
       const metadata = data.metadata
@@ -280,7 +280,6 @@ const getNodeInfo = async ({ store }) => {
 
       const software = data.software
       store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
-      store.dispatch('setInstanceOption', { name: 'backendRepository', value: software.repository })
       store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: software.name === 'pleroma' })
 
       const priv = metadata.private
diff --git a/src/components/announcement_editor/announcement_editor.vue b/src/components/announcement_editor/announcement_editor.vue
index 31473331f..c0a3c30ac 100644
--- a/src/components/announcement_editor/announcement_editor.vue
+++ b/src/components/announcement_editor/announcement_editor.vue
@@ -34,9 +34,8 @@
         id="announcement-all-day"
         v-model="announcement.allDay"
         :disabled="disabled"
-      >
-        {{ $t('announcements.all_day_prompt') }}
-      </Checkbox>
+      />
+      <label for="announcement-all-day">{{ $t('announcements.all_day_prompt') }}</label>
     </span>
   </div>
 </template>
diff --git a/src/components/announcements_page/announcements_page.vue b/src/components/announcements_page/announcements_page.vue
index 44e2cf46a..25f830ffb 100644
--- a/src/components/announcements_page/announcements_page.vue
+++ b/src/components/announcements_page/announcements_page.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="panel panel-default announcements-page">
     <div class="panel-heading">
-      <h1 class="title">
+      <span>
         {{ $t('announcements.page_header') }}
-      </h1>
+      </span>
     </div>
     <div class="panel-body">
       <section
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 29a60cd1e..9e2b0295d 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -48,7 +48,7 @@
   flex: 1 0;
   margin: 0;
 
-  --emoji-size: 1em;
+  --emoji-size: 14px;
 
   &-collapsed-content {
     margin-left: 0.7em;
diff --git a/src/components/bookmark_folder_edit/bookmark_folder_edit.vue b/src/components/bookmark_folder_edit/bookmark_folder_edit.vue
index 709df402a..b6a768d41 100644
--- a/src/components/bookmark_folder_edit/bookmark_folder_edit.vue
+++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.vue
@@ -13,7 +13,7 @@
           icon="chevron-left"
         />
       </button>
-      <h1 class="title">
+      <div class="title">
         <i18n-t
           v-if="id"
           keypath="bookmark_folders.editing_folder"
@@ -26,7 +26,7 @@
           v-else
           keypath="bookmark_folders.creating_folder"
         />
-      </h1>
+      </div>
     </div>
     <div class="panel-body">
       <div class="input-wrap">
diff --git a/src/components/bookmark_folders/bookmark_folders.vue b/src/components/bookmark_folders/bookmark_folders.vue
index fdd461064..d92e95df0 100644
--- a/src/components/bookmark_folders/bookmark_folders.vue
+++ b/src/components/bookmark_folders/bookmark_folders.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="Bookmark-folders panel panel-default">
     <div class="panel-heading">
-      <h1 class="title">
+      <div class="title">
         {{ $t('nav.bookmark_folders') }}
-      </h1>
+      </div>
       <router-link
         :to="{ name: 'bookmark-folder-new' }"
         class="button-default btn new-folder-button"
diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue
index 24bbc9f4a..b33ea67ec 100644
--- a/src/components/chat_list/chat_list.vue
+++ b/src/components/chat_list/chat_list.vue
@@ -7,9 +7,9 @@
     class="chat-list panel panel-default"
   >
     <div class="panel-heading -sticky">
-      <h1 class="title">
+      <span class="title">
         {{ $t("chats.chats") }}
-      </h1>
+      </span>
       <button
         class="button-default"
         @click="newChat"
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index 0213b86fb..68ee7a5ab 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -32,7 +32,7 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 
-  --emoji-size: 1em;
+  --emoji-size: 14px;
 
   .username {
     max-width: 100%;
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 1e502f5a5..8ffcc63b4 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -70,26 +70,21 @@ export default {
   display: inline-block;
   min-height: 1.2em;
 
-  &-indicator,
-  & .label {
-    vertical-align: middle;
-  }
-
   & > &-indicator {
     /* Reset .input stuff */
     padding: 0;
     margin: 0;
     position: relative;
     line-height: inherit;
-    display: inline-block;
-    width: 1.2em;
-    height: 1.2em;
+    display: inline;
+    padding-left: 1.2em;
     box-shadow: none;
   }
 
   &-indicator::before {
     position: absolute;
-    inset: 0;
+    right: 0;
+    top: 0;
     display: block;
     content: "✓";
     transition: color 200ms;
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 1c290b900..526de5c30 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -9,9 +9,7 @@
       v-if="isExpanded"
       class="panel-heading conversation-heading -sticky"
     >
-      <h1 class="title">
-        {{ $t('timeline.conversation') }}
-      </h1>
+      <span class="title"> {{ $t('timeline.conversation') }} </span>
       <button
         v-if="collapsable"
         class="button-unstyled -link"
diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue
index 93b8ac0fa..3bceff229 100644
--- a/src/components/dialog_modal/dialog_modal.vue
+++ b/src/components/dialog_modal/dialog_modal.vue
@@ -8,9 +8,9 @@
       @click.stop=""
     >
       <div class="panel-heading dialog-modal-heading">
-        <h1 class="title">
+        <div class="title">
           <slot name="header" />
-        </h1>
+        </div>
       </div>
       <div class="panel-body dialog-modal-content">
         <slot name="default" />
diff --git a/src/components/edit_status_modal/edit_status_modal.vue b/src/components/edit_status_modal/edit_status_modal.vue
index 5001bd46c..db62972d6 100644
--- a/src/components/edit_status_modal/edit_status_modal.vue
+++ b/src/components/edit_status_modal/edit_status_modal.vue
@@ -6,9 +6,7 @@
   >
     <div class="edit-form-modal-panel panel">
       <div class="panel-heading">
-        <h1 class="title">
-          {{ $t('post_status.edit_status') }}
-        </h1>
+        {{ $t('post_status.edit_status') }}
       </div>
       <PostStatusForm
         class="panel-body"
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue
index cde8d6e42..4cdf56d07 100644
--- a/src/components/features_panel/features_panel.vue
+++ b/src/components/features_panel/features_panel.vue
@@ -2,9 +2,9 @@
   <div class="features-panel">
     <div class="panel panel-default base01-background">
       <div class="panel-heading timeline-heading base02-background base04">
-        <h1 class="title">
+        <div class="title">
           {{ $t('features_panel.title') }}
-        </h1>
+        </div>
       </div>
       <div class="panel-body features-panel">
         <ul>
diff --git a/src/components/follow_requests/follow_requests.vue b/src/components/follow_requests/follow_requests.vue
index b678364cc..41f19db8f 100644
--- a/src/components/follow_requests/follow_requests.vue
+++ b/src/components/follow_requests/follow_requests.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="settings panel panel-default">
     <div class="panel-heading">
-      <h1 class="title">
+      <div class="title">
         {{ $t('nav.friend_requests') }}
-      </h1>
+      </div>
     </div>
     <div class="panel-body">
       <FollowRequestCard
diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue
index 1e2efe402..a2c56af4e 100644
--- a/src/components/interactions/interactions.vue
+++ b/src/components/interactions/interactions.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="panel panel-default">
     <div class="panel-heading">
-      <h1 class="title">
+      <div class="title">
         {{ $t("nav.interactions") }}
-      </h1>
+      </div>
     </div>
     <tab-switcher
       ref="tabSwitcher"
diff --git a/src/components/lists/lists.vue b/src/components/lists/lists.vue
index 05df5b72f..b8bab0a04 100644
--- a/src/components/lists/lists.vue
+++ b/src/components/lists/lists.vue
@@ -2,9 +2,7 @@
   <div class="Lists panel panel-default">
     <div class="panel-heading">
       <div class="title">
-        <h1 class="title">
-          {{ $t('lists.lists') }}
-        </h1>
+        {{ $t('lists.lists') }}
       </div>
       <router-link
         :to="{ name: 'lists-new' }"
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index 3c152b2e4..adc2dd5b4 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -3,7 +3,7 @@
     <!-- Default panel contents -->
 
     <div class="panel-heading">
-      <h1 class="title">{{ $t('login.login') }}</h1>
+      {{ $t('login.login') }}
     </div>
 
     <div class="panel-body">
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index f8c3e6a04..27184fb4e 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -3,9 +3,7 @@
     <!-- Default panel contents -->
 
     <div class="panel-heading">
-      <h1 class="title">
-        {{ $t('login.heading.recovery') }}
-      </h1>
+      {{ $t('login.heading.recovery') }}
     </div>
 
     <div class="panel-body">
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index 26fc1e804..3ec617e9a 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -3,9 +3,7 @@
     <!-- Default panel contents -->
 
     <div class="panel-heading">
-      <h1 class="title">
-        {{ $t('login.heading.totp') }}
-      </h1>
+      {{ $t('login.heading.totp') }}
     </div>
 
     <div class="panel-body">
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index b737155e5..76a90d3e5 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -50,13 +50,13 @@
       @touchmove.stop="notificationsTouchMove"
     >
       <div class="panel-heading mobile-notifications-header">
-        <h1 class="title">
+        <span class="title">
           {{ $t('notifications.notifications') }}
           <span
             v-if="unseenCountBadgeText"
             class="badge -notification unseen-count"
           >{{ unseenCountBadgeText }}</span>
-        </h1>
+        </span>
         <span class="spacer" />
         <button
           v-if="notificationsAtTop"
diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
index d46b25bed..0ca6aea77 100644
--- a/src/components/notification/notification.scss
+++ b/src/components/notification/notification.scss
@@ -10,7 +10,7 @@
     background-color: transparent !important;
   }
 
-  --emoji-size: 1em;
+  --emoji-size: 14px;
 
   &:hover {
     --_still-image-img-visibility: visible;
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 387c3a847..87e7b68d7 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -14,13 +14,13 @@
           v-if="!noHeading"
           class="notifications-heading panel-heading -sticky"
         >
-          <h1 class="title">
+          <div class="title">
             {{ $t('notifications.notifications') }}
             <span
               v-if="unseenCountBadgeText"
               class="badge -notification unseen-count"
             >{{ unseenCountBadgeText }}</span>
-          </h1>
+          </div>
           <div
             v-if="showScrollTop"
             class="rightside-button"
diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue
index 5392f487b..037b859e8 100644
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="settings panel panel-default">
     <div class="panel-heading">
-      <h1 class="title">
-        {{ $t('password_reset.password_reset') }}
-      </h1>
+      {{ $t('password_reset.password_reset') }}
     </div>
     <div class="panel-body">
       <form
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 9ab1d332d..cf411ff18 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -103,36 +103,6 @@
               icon="circle-notch"
             />
           </div>
-          <div
-            v-if="quotable"
-            role="radiogroup"
-            class="btn-group reply-or-quote-selector"
-          >
-            <button
-              :id="`reply-or-quote-option-${randomSeed}-reply`"
-              class="btn button-default reply-or-quote-option"
-              :class="{ toggled: !newStatus.quoting }"
-              tabindex="0"
-              role="radio"
-              :aria-labelledby="`reply-or-quote-option-${randomSeed}-reply`"
-              :aria-checked="!newStatus.quoting"
-              @click="newStatus.quoting = false"
-            >
-              {{ $t('post_status.reply_option') }}
-            </button>
-            <button
-              :id="`reply-or-quote-option-${randomSeed}-quote`"
-              class="btn button-default reply-or-quote-option"
-              :class="{ toggled: newStatus.quoting }"
-              tabindex="0"
-              role="radio"
-              :aria-labelledby="`reply-or-quote-option-${randomSeed}-quote`"
-              :aria-checked="newStatus.quoting"
-              @click="newStatus.quoting = true"
-            >
-              {{ $t('post_status.quote_option') }}
-            </button>
-          </div>
         </div>
         <div
           v-if="showPreview"
@@ -156,6 +126,36 @@
             class="preview-status"
           />
         </div>
+        <div
+          v-if="quotable"
+          role="radiogroup"
+          class="btn-group reply-or-quote-selector"
+        >
+          <button
+            :id="`reply-or-quote-option-${randomSeed}-reply`"
+            class="btn button-default reply-or-quote-option"
+            :class="{ toggled: !newStatus.quoting }"
+            tabindex="0"
+            role="radio"
+            :aria-labelledby="`reply-or-quote-option-${randomSeed}-reply`"
+            :aria-checked="!newStatus.quoting"
+            @click="newStatus.quoting = false"
+          >
+            {{ $t('post_status.reply_option') }}
+          </button>
+          <button
+            :id="`reply-or-quote-option-${randomSeed}-quote`"
+            class="btn button-default reply-or-quote-option"
+            :class="{ toggled: newStatus.quoting }"
+            tabindex="0"
+            role="radio"
+            :aria-labelledby="`reply-or-quote-option-${randomSeed}-quote`"
+            :aria-checked="newStatus.quoting"
+            @click="newStatus.quoting = true"
+          >
+            {{ $t('post_status.quote_option') }}
+          </button>
+        </div>
         <EmojiInput
           v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
           v-model="newStatus.spoilerText"
@@ -447,8 +447,6 @@
 
   .reply-or-quote-selector {
     margin-bottom: 0.5em;
-    display: grid;
-    grid-template-columns: 1fr 1fr;
   }
 
   .text-format {
diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue
index 2bdf41d55..bc2cad4a1 100644
--- a/src/components/post_status_modal/post_status_modal.vue
+++ b/src/components/post_status_modal/post_status_modal.vue
@@ -7,9 +7,7 @@
   >
     <div class="post-form-modal-panel panel">
       <div class="panel-heading">
-        <h1 class="title">
-          {{ $t('post_status.new_status') }}
-        </h1>
+        {{ $t('post_status.new_status') }}
       </div>
       <PostStatusForm
         class="panel-body"
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index cb0209ec7..a2008d871 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="settings panel panel-default">
     <div class="panel-heading">
-      <h1 class="title">
-        {{ $t('registration.registration') }}
-      </h1>
+      {{ $t('registration.registration') }}
     </div>
     <div
       v-if="!hasSignUpNotice"
diff --git a/src/components/remote_user_resolver/remote_user_resolver.vue b/src/components/remote_user_resolver/remote_user_resolver.vue
index cbd4d19c4..07aac169f 100644
--- a/src/components/remote_user_resolver/remote_user_resolver.vue
+++ b/src/components/remote_user_resolver/remote_user_resolver.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="panel panel-default">
     <div class="panel-heading">
-      <h1 class="title">
-        {{ $t('remote_user_resolver.remote_user_resolver') }}
-      </h1>
+      {{ $t('remote_user_resolver.remote_user_resolver') }}
     </div>
     <div class="panel-body">
       <p>
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index 00e700cfb..bd384ad3f 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="Search panel panel-default">
     <div class="panel-heading">
-      <h1 class="title">
+      <div class="title">
         {{ $t('nav.search') }}
-      </h1>
+      </div>
     </div>
     <div class="panel-body search-input-container">
       <input
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 96be5312c..2214959f6 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -84,7 +84,7 @@ label.Select {
     width: 0.875em;
     font-family: var(--font);
     line-height: 2;
-    z-index: 1;
+    z-index: 0;
     pointer-events: none;
   }
 }
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index b9f7c3557..90dbbde0a 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -7,9 +7,9 @@
   >
     <div class="settings-modal-panel panel">
       <div class="panel-heading">
-        <h1 class="title">
+        <span class="title">
           {{ modalMode === 'user' ? $t('settings.settings') : $t('admin_dash.window_title') }}
-        </h1>
+        </span>
         <transition name="fade">
           <div
             v-if="currentSaveStateNotice"
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_preview.vue b/src/components/settings_modal/tabs/theme_tab/theme_preview.vue
index 4446c18b9..dbaecee45 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_preview.vue
@@ -3,12 +3,12 @@
     <div class="underlay underlay-preview" />
     <div class="panel dummy">
       <div class="panel-heading">
-        <h1 class="title">
+        <div class="title">
           {{ $t('settings.style.preview.header') }}
           <span class="badge -notification">
             99
           </span>
-        </h1>
+        </div>
         <span class="faint">
           {{ $t('settings.style.preview.header_faint') }}
         </span>
diff --git a/src/components/settings_modal/tabs/version_tab.js b/src/components/settings_modal/tabs/version_tab.js
index 20a671735..616bdadf5 100644
--- a/src/components/settings_modal/tabs/version_tab.js
+++ b/src/components/settings_modal/tabs/version_tab.js
@@ -1,17 +1,22 @@
+import { extractCommit } from 'src/services/version/version.service'
+
 const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
+const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'
 
 const VersionTab = {
   data () {
     const instance = this.$store.state.instance
     return {
       backendVersion: instance.backendVersion,
-      backendRepository: instance.backendRepository,
       frontendVersion: instance.frontendVersion
     }
   },
   computed: {
     frontendVersionLink () {
       return pleromaFeCommitUrl + this.frontendVersion
+    },
+    backendVersionLink () {
+      return pleromaBeCommitUrl + extractCommit(this.backendVersion)
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/version_tab.vue b/src/components/settings_modal/tabs/version_tab.vue
index 917a618e6..0330d49f8 100644
--- a/src/components/settings_modal/tabs/version_tab.vue
+++ b/src/components/settings_modal/tabs/version_tab.vue
@@ -7,7 +7,7 @@
           <ul class="option-list">
             <li>
               <a
-                :href="backendRepository"
+                :href="backendVersionLink"
                 target="_blank"
               >{{ backendVersion }}</a>
             </li>
diff --git a/src/components/shout_panel/shout_panel.vue b/src/components/shout_panel/shout_panel.vue
index 67927df88..9113211eb 100644
--- a/src/components/shout_panel/shout_panel.vue
+++ b/src/components/shout_panel/shout_panel.vue
@@ -9,14 +9,14 @@
         :class="{ 'shout-heading': floating }"
         @click.stop.prevent="togglePanel"
       >
-        <h1 class="title">
+        <div class="title">
           {{ $t('shoutbox.title') }}
           <FAIcon
             v-if="floating"
             icon="times"
             class="close-icon"
           />
-        </h1>
+        </div>
       </div>
       <div class="panel-body shout-window">
         <div
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 91b10ea08..608b5608e 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -76,21 +76,6 @@
             /> {{ $t("nav.lists") }}
           </router-link>
         </li>
-        <li
-          v-if="currentUser"
-          @click="toggleDrawer"
-        >
-          <router-link
-            :to="{ name: 'bookmarks' }"
-            class="menu-item"
-          >
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding"
-              icon="bookmark"
-            /> {{ $t("nav.bookmarks") }}
-          </router-link>
-        </li>
         <li
           v-if="currentUser && pleromaChatMessagesAvailable"
           @click="toggleDrawer"
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 85ad24b31..344e4b8ef 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -72,7 +72,7 @@
     text-overflow: ellipsis;
 
     --_still_image-label-scale: 0.25;
-    --emoji-size: 1em;
+    --emoji-size: 14px;
   }
 
   .status-favicon {
diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss
index cc66dc5a7..0a467b4f5 100644
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@@ -113,7 +113,7 @@
     align-items: top;
     flex-direction: row;
 
-    --emoji-size: calc(var(--emojiSize, 32px) / 2);
+    --emoji-size: 16px;
 
     & .body,
     & .attachments {
diff --git a/src/components/status_history_modal/status_history_modal.vue b/src/components/status_history_modal/status_history_modal.vue
index d89f49599..79642e9c8 100644
--- a/src/components/status_history_modal/status_history_modal.vue
+++ b/src/components/status_history_modal/status_history_modal.vue
@@ -6,9 +6,7 @@
   >
     <div class="status-history-modal-panel panel">
       <div class="panel-heading">
-        <h1 class="title">
-          {{ $t('status.status_history') }} ({{ historyCount }})
-        </h1>
+        {{ $t('status.status_history') }} ({{ historyCount }})
       </div>
       <div class="panel-body">
         <div
diff --git a/src/components/timeago/timeago.vue b/src/components/timeago/timeago.vue
index 484944d61..bf9184419 100644
--- a/src/components/timeago/timeago.vue
+++ b/src/components/timeago/timeago.vue
@@ -61,7 +61,7 @@ export default {
           })
         } else if (DateUtils.isSameMonth(this.timeAsDate, now)) {
           return new Intl.DateTimeFormat(this.browserLocale, {
-            month: 'short',
+            hour: 'numeric',
             day: 'numeric'
           })
         } else if (DateUtils.isSameYear(this.timeAsDate, now)) {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 413b75504..862a19729 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,12 +1,12 @@
 <template>
   <div :class="['Timeline', classes.root]">
-    <div :class="classes.header" v-if="!embedded">
+    <div :class="classes.header">
       <TimelineMenu
         v-if="!embedded"
         :timeline-name="timelineName"
       />
       <div
-        v-if="showScrollTop"
+        v-if="showScrollTop && !embedded"
         class="rightside-button"
       >
         <button
@@ -24,7 +24,7 @@
           </FALayers>
         </button>
       </div>
-      <template v-if="mobileLayout">
+      <template v-if="mobileLayout && !embedded">
         <div
           v-if="showLoadButton"
           class="rightside-button"
@@ -44,7 +44,7 @@
           </button>
         </div>
         <div
-          v-else
+          v-else-if="!embedded"
           class="loadmore-text faint veryfaint rightside-icon"
           :title="$t('timeline.up_to_date')"
           :aria-disabled="true"
@@ -65,7 +65,7 @@
           {{ loadButtonString }}
         </button>
         <div
-          v-else
+          v-else-if="!embedded"
           class="loadmore-text faint"
           @click.prevent
         >
@@ -73,9 +73,11 @@
         </div>
       </template>
       <QuickFilterSettings
+        v-if="!embedded"
         class="rightside-button"
       />
       <QuickViewSettings
+        v-if="!embedded"
         class="rightside-button"
       />
     </div>
@@ -146,8 +148,6 @@
           />
         </div>
       </teleport>
-      <!-- spacer to avoid having empty shrug -->
-      <span v-if="embedded && footerSlipgate" />
     </div>
   </div>
 </template>
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index 717c8a8e8..bdcfb73d6 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -29,8 +29,8 @@
       </ul>
     </template>
     <template #trigger>
-      <span class="button-unstyled timeline-menu-title">
-        <h1 class="title timeline-title">{{ timelineName() }}</h1>
+      <span class="button-unstyled title timeline-menu-title">
+        <span class="timeline-title">{{ timelineName() }}</span>
         <span>
           <FAIcon
             size="sm"
diff --git a/src/components/update_notification/update_notification.vue b/src/components/update_notification/update_notification.vue
index 6fc363d41..78e70a743 100644
--- a/src/components/update_notification/update_notification.vue
+++ b/src/components/update_notification/update_notification.vue
@@ -9,9 +9,9 @@
       :class="{ '-peek': !showingMore }"
     >
       <div class="panel-heading">
-        <h1 class="title">
+        <span class="title">
           {{ $t('update.big_update_title') }}
-        </h1>
+        </span>
       </div>
       <div class="panel-body">
         <div
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 87af9d0f5..70c4f67df 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -208,7 +208,7 @@
             />
             <template v-if="relationship.following">
               <ProgressButton
-                v-if="!relationship.notifying"
+                v-if="!relationship.subscribing"
                 class="btn button-default"
                 :click="subscribeUser"
                 :title="$t('user_card.subscribe')"
diff --git a/src/components/user_link/user_link.vue b/src/components/user_link/user_link.vue
index 80b941d32..efd96e12a 100644
--- a/src/components/user_link/user_link.vue
+++ b/src/components/user_link/user_link.vue
@@ -1,16 +1,12 @@
 <template>
-  <div class="user-profile-link">
-    <router-link
-      :title="user.screen_name_ui"
-      :to="userProfileLink(user)"
-    >
-      <slot>
-        {{ at ? '@' : '' }}{{ user.screen_name_ui }}<UnicodeDomainIndicator
-          :user="user"
-        />
-      </slot>
-    </router-link>
-  </div>
+  <router-link
+    :title="user.screen_name_ui"
+    :to="userProfileLink(user)"
+  >
+    {{ at ? '@' : '' }}{{ user.screen_name_ui }}<UnicodeDomainIndicator
+      :user="user"
+    />
+  </router-link>
 </template>
 
 <script>
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 293a47094..cd1344535 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -51,7 +51,7 @@
 .user-list-popover {
   padding: 0.5em;
 
-  --emoji-size: calc(var(--emojiSize, 32px) / 2);
+  --emoji-size: 16px;
 
   .user-list-row {
     padding: 0.25em;
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 103074a23..1ec12d0ce 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -142,9 +142,9 @@
       class="panel user-profile-placeholder"
     >
       <div class="panel-heading">
-        <h1 class="title">
+        <div class="title">
           {{ $t('settings.profile_tab') }}
-        </h1>
+        </div>
       </div>
       <div>
         <span v-if="error">{{ error }}</span>
@@ -166,7 +166,7 @@
   flex-basis: 500px;
 
   // No sticky header on user profile
-  --currentPanelStack: 0;
+  --currentPanelStack: 1;
 
   .user-birthday {
     margin: 0 0.75em 0.5em;
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 100d1e7f7..2bda509a4 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -6,7 +6,7 @@
     <div class="user-reporting-panel panel">
       <div class="panel-heading">
         <i18n-t
-          tag="h1"
+          tag="div"
           keypath="user_reporting.title"
           class="title"
         >
diff --git a/src/components/who_to_follow/who_to_follow.vue b/src/components/who_to_follow/who_to_follow.vue
index 7cb4d4766..56543d91b 100644
--- a/src/components/who_to_follow/who_to_follow.vue
+++ b/src/components/who_to_follow/who_to_follow.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="panel panel-default">
     <div class="panel-heading">
-      <h1 class="title">
-        {{ $t('who_to_follow.who_to_follow') }}
-      </h1>
+      {{ $t('who_to_follow.who_to_follow') }}
     </div>
     <div class="panel-body">
       <FollowCard
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.vue b/src/components/who_to_follow_panel/who_to_follow_panel.vue
index 92d6f6d7c..0fecec0bd 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.vue
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.vue
@@ -2,9 +2,9 @@
   <div class="who-to-follow-panel">
     <div class="panel panel-default base01-background">
       <div class="panel-heading timeline-heading base02-background base04">
-        <h1 class="title">
+        <div class="title">
           {{ $t('who_to_follow.who_to_follow') }}
-        </h1>
+        </div>
       </div>
       <div class="who-to-follow">
         <p
diff --git a/src/main.js b/src/main.js
index eee463cc7..f63deb490 100644
--- a/src/main.js
+++ b/src/main.js
@@ -76,9 +76,7 @@ const persistedStateOptions = {
 
   window.splashError = e => splashError(i18n, e)
   window.splashUpdate = key => {
-    if (document.querySelector('#status')) {
-      document.querySelector('#status').textContent = i18n.global.t(key)
-    }
+    document.querySelector('#status').textContent = i18n.global.t(key)
   }
 
   try {
diff --git a/src/modules/config.js b/src/modules/config.js
index c92a730da..b3b8950b2 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -185,7 +185,7 @@ export const defaultState = {
   closingDrawerMarksAsSeen: undefined, // instance default
   unseenAtTop: undefined, // instance default
   ignoreInactionableSeen: undefined, // instance default
-  useAbsoluteTimeFormat: undefined, // instance default
+  useAbsoluteTimeFormat: undefined, // instance defualt
   absoluteTimeFormatMinAge: undefined // instance default
 }
 
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 23d022c6f..2ea8cf9b6 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -159,7 +159,6 @@ const defaultState = {
 
   // Version Information
   backendVersion: '',
-  backendRepository: '',
   frontendVersion: '',
 
   pollsAvailable: false,
diff --git a/src/modules/users.js b/src/modules/users.js
index 61249006e..47b43c6f6 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -452,11 +452,11 @@ const users = {
       commit('clearFollowers', userId)
     },
     subscribeUser ({ rootState, commit }, id) {
-      return rootState.api.backendInteractor.followUser({ id, notify: true })
+      return rootState.api.backendInteractor.subscribeUser({ id })
         .then((relationship) => commit('updateUserRelationship', [relationship]))
     },
     unsubscribeUser ({ rootState, commit }, id) {
-      return rootState.api.backendInteractor.followUser({ id, notify: false })
+      return rootState.api.backendInteractor.unsubscribeUser({ id })
         .then((relationship) => commit('updateUserRelationship', [relationship]))
     },
     toggleActivationStatus ({ rootState, commit }, { user }) {
diff --git a/src/panel.scss b/src/panel.scss
index 47d55aa4a..e974e7f6d 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -115,8 +115,6 @@
 
   .title {
     font-size: 1.3em;
-    margin: 0;
-    font-weight: normal;
   }
 
   .alert {
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 322282233..94c123601 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -68,6 +68,8 @@ const MASTODON_UNBLOCK_USER_URL = id => `/api/v1/accounts/${id}/unblock`
 const MASTODON_MUTE_USER_URL = id => `/api/v1/accounts/${id}/mute`
 const MASTODON_UNMUTE_USER_URL = id => `/api/v1/accounts/${id}/unmute`
 const MASTODON_REMOVE_USER_FROM_FOLLOWERS = id => `/api/v1/accounts/${id}/remove_from_followers`
+const MASTODON_SUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/subscribe`
+const MASTODON_UNSUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/unsubscribe`
 const MASTODON_USER_NOTE_URL = id => `/api/v1/accounts/${id}/note`
 const MASTODON_BOOKMARK_STATUS_URL = id => `/api/v1/statuses/${id}/bookmark`
 const MASTODON_UNBOOKMARK_STATUS_URL = id => `/api/v1/statuses/${id}/unbookmark`
@@ -273,7 +275,6 @@ const followUser = ({ id, credentials, ...options }) => {
   const url = MASTODON_FOLLOW_URL(id)
   const form = {}
   if (options.reblogs !== undefined) { form.reblogs = options.reblogs }
-  if (options.notify !== undefined) { form.notify = options.notify }
   return fetch(url, {
     body: JSON.stringify(form),
     headers: {
@@ -1179,6 +1180,14 @@ const unmuteUser = ({ id, credentials }) => {
   return promisedRequest({ url: MASTODON_UNMUTE_USER_URL(id), credentials, method: 'POST' })
 }
 
+const subscribeUser = ({ id, credentials }) => {
+  return promisedRequest({ url: MASTODON_SUBSCRIBE_USER(id), credentials, method: 'POST' })
+}
+
+const unsubscribeUser = ({ id, credentials }) => {
+  return promisedRequest({ url: MASTODON_UNSUBSCRIBE_USER(id), credentials, method: 'POST' })
+}
+
 const fetchBlocks = ({ maxId, credentials }) => {
   const query = new URLSearchParams({ with_relationships: true })
   if (maxId) {
@@ -1969,6 +1978,8 @@ const apiService = {
   fetchMutes,
   muteUser,
   unmuteUser,
+  subscribeUser,
+  unsubscribeUser,
   fetchBlocks,
   fetchOAuthTokens,
   revokeOAuthToken,
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 3791c6f34..d0a0ee084 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -118,12 +118,7 @@ export const tryLoadCache = async () => {
   }
 }
 
-export const applyTheme = (
-  input,
-  onEagerFinish = data => {},
-  onFinish = data => {},
-  debug
-) => {
+export const applyTheme = (input, onEagerFinish = data => {}, onFinish = data => {}, debug) => {
   const eagerStyles = createStyleSheet(EAGER_STYLE_ID)
   const lazyStyles = createStyleSheet(LAZY_STYLE_ID)
 
diff --git a/src/services/version/version.service.js b/src/services/version/version.service.js
new file mode 100644
index 000000000..2e11bf3a1
--- /dev/null
+++ b/src/services/version/version.service.js
@@ -0,0 +1,6 @@
+
+export const extractCommit = versionString => {
+  const regex = /-g(\w+)/i
+  const matches = versionString.match(regex)
+  return matches ? matches[1] : ''
+}
diff --git a/test/unit/specs/services/version/version.service.spec.js b/test/unit/specs/services/version/version.service.spec.js
new file mode 100644
index 000000000..519145ee1
--- /dev/null
+++ b/test/unit/specs/services/version/version.service.spec.js
@@ -0,0 +1,11 @@
+import { extractCommit } from 'src/services/version/version.service.js'
+
+describe('extractCommit', () => {
+  it('return short commit hash following "-g" characters', () => {
+    expect(extractCommit('1.0.0-45-g5e7aeebc')).to.eql('5e7aeebc')
+  })
+
+  it('return short commit hash without branch name', () => {
+    expect(extractCommit('1.0.0-45-g5e7aeebc-branch')).to.eql('5e7aeebc')
+  })
+})