diff --git a/.stylelintrc.json b/.stylelintrc.json
index c91107595..afdfd5f5b 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -12,6 +12,8 @@
     "custom-property-pattern": null,
     "keyframes-name-pattern": null,
     "scss/operator-no-newline-after": null,
+    "declaration-property-value-no-unknown": true,
+    "scss/declaration-property-value-no-unknown": true,
     "declaration-block-no-redundant-longhand-properties": [
       true,
       {
diff --git a/changelog.d/linter.skip b/changelog.d/linter.skip
new file mode 100644
index 000000000..e69de29bb
diff --git a/changelog.d/user_profile_redesign.change b/changelog.d/user_profile_redesign.change
new file mode 100644
index 000000000..27fc5f890
--- /dev/null
+++ b/changelog.d/user_profile_redesign.change
@@ -0,0 +1 @@
+User card/profile got an overhaul
diff --git a/src/App.scss b/src/App.scss
index d56306c9e..64c8b8b82 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -525,6 +525,10 @@ textarea {
     height: unset;
   }
 
+  &::placeholder {
+    color: var(--textFaint)
+  }
+
   --_padding: 0.5em;
 
   border: none;
@@ -1075,7 +1079,7 @@ option {
         scale: 1.0063 0.9938;
         translate: 0 -10%;
         transform: rotateZ(var(--defaultZ));
-        animation-timing-function: ease-in-ou;
+        animation-timing-function: ease-in-out;
       }
 
       90% {
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index f3cca45d0..cc00a735d 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -3,7 +3,6 @@
     <Popover
       trigger="click"
       placement="bottom"
-      :bound-to="{ x: 'container' }"
       remove-padding
     >
       <template #content>
@@ -140,9 +139,9 @@
       </confirm-modal>
       <UserTimedFilterModal
         v-if="blockExpirationSupported"
+        ref="timedBlockDialog"
         :is-mute="false"
         :user="user"
-        ref="timedBlockDialog"
       />
     </teleport>
   </div>
diff --git a/src/components/block_card/block_card.vue b/src/components/block_card/block_card.vue
index 9f64a8e8c..90b9a2b16 100644
--- a/src/components/block_card/block_card.vue
+++ b/src/components/block_card/block_card.vue
@@ -1,7 +1,10 @@
 <template>
   <basic-user-card :user="user">
     <div class="block-card-content-container">
-      <span v-if="blocked && blockExpiryAvailable" class="alert neutral">
+      <span
+        v-if="blocked && blockExpiryAvailable"
+        class="alert neutral"
+      >
         {{ blockExpiry }}
       </span>
       {{ ' ' }}
@@ -22,9 +25,9 @@
     </div>
     <teleport to="#modal">
       <UserTimedFilterModal
+        ref="timedBlockDialog"
         :user="user"
         :is-mute="false"
-        ref="timedBlockDialog"
       />
     </teleport>
   </basic-user-card>
diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue
index bcdf435fc..266ad4d4e 100644
--- a/src/components/color_input/color_input.vue
+++ b/src/components/color_input/color_input.vue
@@ -19,7 +19,7 @@
     />
     <div
       class="input color-input-field"
-      :class="{ disabled: !present || disabled }"
+      :class="{ disabled: !present || disabled, unstyled }"
     >
       <input
         :id="name + '-t'"
@@ -92,6 +92,11 @@ export default {
       required: true,
       type: String
     },
+    // use unstyled, uh, style
+    unstyled: {
+      required: false,
+      type: Boolean
+    },
     // Color value, should be required but vue cannot tell the difference
     // between "property missing" and "property set to undefined"
     modelValue: {
diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index 05600c790..e318cdb40 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -154,10 +154,12 @@
       // Autoprefixed seem to ignore this one, and also syntax is different
       /* stylelint-disable mask-composite */
       /* stylelint-disable declaration-property-value-no-unknown */
+      /* stylelint-disable scss/declaration-property-value-no-unknown */
 
       /* TODO check if this is still needed */
       mask-composite: xor;
       /* stylelint-enable declaration-property-value-no-unknown */
+      /* stylelint-enable scss/declaration-property-value-no-unknown */
       /* stylelint-enable mask-composite */
       mask-composite: exclude;
 
diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue
index 6043e64e9..7209e9144 100644
--- a/src/components/gallery/gallery.vue
+++ b/src/components/gallery/gallery.vue
@@ -159,9 +159,11 @@
       /* Autoprefixed seem to ignore this one, and also syntax is different */
       /* stylelint-disable mask-composite */
       /* stylelint-disable declaration-property-value-no-unknown */
+      /* stylelint-disable scss/declaration-property-value-no-unknown */
 
       /* TODO check if this is still needed */
       mask-composite: xor;
+      /* stylelint-enable scss/declaration-property-value-no-unknown */
       /* stylelint-enable declaration-property-value-no-unknown */
       /* stylelint-enable mask-composite */
       mask-composite: exclude;
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index 9c8894bff..da33b89dc 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -208,6 +208,8 @@
 }
 
 .moderation-tools-button {
+  white-space: nowrap;
+
   svg,
   i {
     font-size: 0.8em;
diff --git a/src/components/mute_card/mute_card.vue b/src/components/mute_card/mute_card.vue
index 60638d3ba..83520dc22 100644
--- a/src/components/mute_card/mute_card.vue
+++ b/src/components/mute_card/mute_card.vue
@@ -1,7 +1,10 @@
 <template>
   <basic-user-card :user="user">
     <div class="mute-card-content-container">
-      <span v-if="muted && muteExpiryAvailable" class="alert neutral">
+      <span
+        v-if="muted && muteExpiryAvailable"
+        class="alert neutral"
+      >
         {{ muteExpiry }}
       </span>
       {{ ' ' }}
@@ -22,9 +25,9 @@
     </div>
     <teleport to="#modal">
       <UserTimedFilterModal
+        ref="timedMuteDialog"
         :user="user"
         :is-mute="true"
-        ref="timedMuteDialog"
       />
     </teleport>
   </basic-user-card>
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 2b05d1906..a699653f0 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -95,8 +95,8 @@
             </option>
           </Select>
           <ul
-            class="setting-list suboptions"
             v-if="onMuteDefaultActionLv1 === 'temporarily'"
+            class="setting-list suboptions"
           >
             <li>
               <UnitSetting
@@ -125,8 +125,8 @@
             </option>
           </Select>
           <ul
-            class="setting-list suboptions"
             v-if="onBlockDefaultActionLv1 === 'temporarily'"
+            class="setting-list suboptions"
           >
             <li>
               <UnitSetting
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 40d40bc3e..411fd8772 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -69,6 +69,22 @@
             {{ $t('settings.user_popover_avatar_overlay') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting
+            path="userCardLeftJustify"
+            expert="1"
+          >
+            {{ $t('settings.user_card_left_justify') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            path="userCardHidePersonalMarks"
+            expert="1"
+          >
+            {{ $t('settings.user_card_hide_personal_marks') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="alwaysShowNewPostButton"
@@ -107,7 +123,10 @@
               </BooleanSetting>
             </li>
             <li>
-              <BooleanSetting v-if="!blockExpirationSupported" path="modalOnBlock">
+              <BooleanSetting
+                v-if="!blockExpirationSupported"
+                path="modalOnBlock"
+              >
                 {{ $t('settings.confirm_dialogs_block') }}
               </BooleanSetting>
             </li>
diff --git a/src/components/status_action_buttons/action_button_container.vue b/src/components/status_action_buttons/action_button_container.vue
index 75f5010ee..b7ff10f3c 100644
--- a/src/components/status_action_buttons/action_button_container.vue
+++ b/src/components/status_action_buttons/action_button_container.vue
@@ -95,9 +95,9 @@
         :user="user"
       />
       <UserTimedFilterModal
+        ref="confirmUser"
         :is-mute="true"
         :user="user"
-        ref="confirmUser"
       />
     </teleport>
   </div>
diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss
index f89ea8d89..a8a7d662a 100644
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@@ -73,9 +73,11 @@
         /* Autoprefixed seem to ignore this one, and also syntax is different */
         /* stylelint-disable mask-composite */
         /* stylelint-disable declaration-property-value-no-unknown */
+        /* stylelint-disable scss/declaration-property-value-no-unknown */
 
         /* TODO check if this is still needed */
         mask-composite: xor;
+        /* stylelint-enable scss/declaration-property-value-no-unknown */
         /* stylelint-enable declaration-property-value-no-unknown */
         /* stylelint-enable mask-composite */
         mask-composite: exclude;
@@ -156,9 +158,11 @@
       /* Autoprefixed seem to ignore this one, and also syntax is different */
       /* stylelint-disable mask-composite */
       /* stylelint-disable declaration-property-value-no-unknown */
+      /* stylelint-disable scss/declaration-property-value-no-unknown */
 
       /* TODO check if this is still needed */
       mask-composite: xor;
+      /* stylelint-enable scss/declaration-property-value-no-unknown */
       /* stylelint-enable declaration-property-value-no-unknown */
       /* stylelint-enable mask-composite */
       mask-composite: exclude;
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 353a891f6..bb36c1255 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -1,3 +1,4 @@
+import ColorInput from 'src/components/color_input/color_input.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import RemoteFollow from '../remote_follow/remote_follow.vue'
 import ProgressButton from '../progress_button/progress_button.vue'
@@ -9,6 +10,7 @@ import Select from '../select/select.vue'
 import UserLink from '../user_link/user_link.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
+import localeService from 'src/services/locale/locale.service.js'
 
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { mapGetters } from 'vuex'
@@ -21,7 +23,8 @@ import {
   faExternalLinkAlt,
   faEdit,
   faTimes,
-  faExpandAlt
+  faExpandAlt,
+  faBirthdayCake
 } from '@fortawesome/free-solid-svg-icons'
 
 import { useMediaViewerStore } from '../../stores/media_viewer'
@@ -34,7 +37,8 @@ library.add(
   faExternalLinkAlt,
   faEdit,
   faTimes,
-  faExpandAlt
+  faExpandAlt,
+  faBirthdayCake
 )
 
 export default {
@@ -60,7 +64,8 @@ export default {
     RichContent,
     UserLink,
     UserNote,
-    UserTimedFilterModal
+    UserTimedFilterModal,
+    ColorInput
   },
   data () {
     return {
@@ -175,6 +180,10 @@ export default {
         ? this.$t('user_card.block_expires_forever')
         : this.$t('user_card.block_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()])
     },
+    formattedBirthday () {
+      const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale)
+      return this.user.birthday && new Date(Date.parse(this.user.birthday)).toLocaleDateString(browserLocale, { timeZone: 'UTC', day: 'numeric', month: 'long', year: 'numeric' })
+    },
     ...mapGetters(['mergedConfig'])
   },
   methods: {
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index 418bef08b..53f885446 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -2,63 +2,91 @@
   position: relative;
   z-index: 1;
 
+  .user-card-inner {
+    padding-bottom: 0;
+  }
+
+  .user-card-bio {
+    &.-justify-left {
+      text-align: start;
+    }
+  }
+
   &:hover {
     --_still-image-img-visibility: visible;
     --_still-image-canvas-visibility: hidden;
     --_still-image-label-visibility: hidden;
   }
 
-  .btn-mute, .btn-mention {
-    display: block;
-    width: 100%;
-  }
-
   .panel-heading {
-    padding: 0.5em 0;
     text-align: center;
     box-shadow: none;
     background: transparent;
+    backdrop-filter: none;
     flex-direction: column;
     align-items: stretch;
     // create new stacking context
     position: relative;
   }
 
+  .personal-marks {
+    margin: 0.6em;
+    padding: 0.6em;
+
+    &:not(:last-child) {
+      border-bottom: 1px solid var(--border);
+    }
+
+    .highlighter {
+      h4 {
+        margin-top: 0.6em;
+      }
+
+      .userHighlightSel {
+        vertical-align: bottom;
+        margin-left: -0.1em;
+
+        &.-none select {
+          color: var(--textFaint);
+
+          option {
+            color: var(--text);
+            background: var(--background);
+          }
+        }
+      }
+
+      .highlighter-color {
+        vertical-align: bottom;
+        margin-left: 0.6em;
+      }
+    }
+  }
+
   .background-image {
     position: absolute;
     inset: 0;
-    mask:
-      linear-gradient(to top, white, transparent) bottom no-repeat,
-      linear-gradient(to top, white, white);
-    // Autoprefixer seem to ignore this one, and also syntax is different
-    /* stylelint-disable mask-composite */
-    /* stylelint-disable declaration-property-value-no-unknown */
-
-    /* TODO check if this is still needed */
-    mask-composite: xor;
-    /* stylelint-enable declaration-property-value-no-unknown */
-    /* stylelint-enable mask-composite */
-    mask-composite: exclude;
+    right: -1.2em;
+    left: -1.2em;
+    top: -1.4em;
+    padding: 0;
+    mask: linear-gradient(to top, transparent 0, white 5em) bottom no-repeat;
     background-size: cover;
-    mask-size: 100% 60%;
     border-top-left-radius: calc(var(--__roundnessTop, --panelRadius) - 1px);
     border-top-right-radius: calc(var(--__roundnessTop, --panelRadius) - 1px);
     border-bottom-left-radius: calc(var(--__roundnessBottom, --panelRadius) - 1px);
     border-bottom-right-radius: calc(var(--__roundnessBottom, --panelRadius) - 1px);
     background-color: var(--profileBg);
     z-index: -2;
-
-    &.hide-bio {
-      mask-size: 100% 40px;
-    }
   }
 
   &-bio {
     text-align: center;
+    color: var(--lightText);
     display: block;
     line-height: 1.3;
-    padding: 1em;
-    margin: 0;
+    padding: 0.6em;
+    margin: 0 0.6em;
 
     img {
       object-fit: contain;
@@ -98,14 +126,19 @@
 }
 
 .user-info {
-  padding: 0 26px;
+  position: relative;
+  margin: 0.6em;
+  margin-bottom: 0;
+  text-align: right;
 
-  .container {
-    min-width: 0;
-    padding: 16px 0 6px;
+  .user-identity {
+    position: relative;
+    aspect-ratio: 3;
+    min-height: 6em;
     display: flex;
-    align-items: flex-start;
-    max-height: 56px;
+    align-items: flex-end;
+    margin-bottom: 1em;
+    container: user-card / inline-size;
 
     > * {
       min-width: 0;
@@ -121,19 +154,51 @@
       --_avatarShadowFilter: var(--avatarShadowFilter);
       --_avatarShadowInset: var(--avatarShadowInset);
 
-      width: 56px;
-      height: 56px;
+      width: 7em;
+      width: calc(min(7em, 20cqw));
+      height: 7em;
+      height: calc(min(7em, 20cqw));
       object-fit: cover;
     }
   }
 
+  .other-actions {
+    position: relative;
+    display: inline-grid;
+    grid-auto-flow: column;
+    grid-gap: 0.6em;
+    font-size: 1.25rem;
+    z-index: 2;
+    align-self: end;
+
+    a, button, div {
+      text-align: center;
+      width: 2em;
+      height: 2em;
+      line-height: 2em;
+      padding: 0.6em;
+      margin: -0.6em;
+
+      &:hover .icon {
+        color: var(--textFaint);
+      }
+
+      &:not(:hover) .icon {
+        color: var(--lightText);
+      }
+    }
+  }
+
   &-avatar {
     position: relative;
     cursor: pointer;
+    margin-right: 0.6em;
 
     &.-overlay {
       position: absolute;
-      inset: 0;
+      inset: -0.6em;
+      left: -0.6em;
+      right: -1.2em;
       background-color: rgb(0 0 0 / 30%);
       display: flex;
       justify-content: center;
@@ -152,51 +217,10 @@
     }
   }
 
-  .external-link-button,
-  .edit-profile-button {
-    cursor: pointer;
-    width: 2.5em;
-    text-align: center;
-    margin: -0.5em 0;
-    padding: 0.5em 0;
-
-    &:not(:hover) .icon {
-      color: var(--lightText);
-    }
-  }
-
-  .bottom-line {
-    font-weight: lighter;
-    font-size: 1.1em;
-    align-items: baseline;
-
-    .lock-icon {
-      margin-left: 0.5em;
-    }
-
-    .user-screen-name {
-      color: var(--text);
-      min-width: 1px;
-      flex: 0 1 auto;
-      text-overflow: ellipsis;
-      overflow: hidden;
-    }
-
-    .dailyAvg {
-      min-width: 1px;
-      flex: 0 0 auto;
-      margin-left: 1em;
-      font-size: 0.7em;
-      color: var(--text);
-    }
-
-    .user-role {
-      flex: none;
-    }
-  }
-
   .user-summary {
-    display: block;
+    align-self: stretch;
+    display: flex;
+    flex-direction: column;
     margin-left: 0.6em;
     text-align: left;
     text-overflow: ellipsis;
@@ -214,23 +238,58 @@
       --link: var(--text) !important;
     }
 
-    .top-line,
+    .top-line {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      flex: 1;
+      // these two normalize position and height when custom emoji are used
+      line-height: 2;
+      margin-bottom: -0.2em;
+      font-weight: 600;
+      font-size: 110%;
+      font-size: calc(max(110%, 4cqw));
+    }
+
     .bottom-line {
       display: flex;
+      align-items: baseline;
+      flex-wrap: wrap;
+      white-space: normal;
+      font-weight: 500;
+      font-size: 0.9em;
+      line-height: 1.5;
+    }
+
+    .lock-icon {
+      display: inline-block;
+      vertical-align: baseline;
+      overflow-x: hidden;
+      margin: 0 0.35em 0 0.5em;
+    }
+
+    .user-screen-name {
+      color: var(--text);
+      text-overflow: ellipsis;
+      overflow: hidden;
+      display: inline-block;
+    }
+
+    .user-role {
+      display: inline-block;
+      vertical-align: baseline;
     }
   }
 
   .user-name {
     text-overflow: ellipsis;
     overflow: hidden;
-    flex: 1 1 auto;
     margin-right: 1em;
     font-size: 1.1em;
   }
 
-  .user-meta {
-    margin-bottom: 0.15em;
-    display: flex;
+  .highlighter {
+    margin: 5em;
     align-items: baseline;
     line-height: 22px;
     flex-wrap: wrap;
@@ -277,23 +336,18 @@
 
   .user-interactions {
     position: relative;
-    display: flex;
-    flex-flow: row wrap;
-    margin-right: -0.75em;
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(7.5em, 20%));
+    grid-gap: 0.6em;
+    max-width: 98vw;
 
-    > * {
-      margin: 0 0.75em 0.6em 0;
+    .popover-trigger-button, .moderation-tools-button {
+      width: 100%;
+    }
+
+    > .btn-group, > button {
       white-space: nowrap;
-      min-width: 95px;
     }
-
-    button {
-      margin: 0;
-    }
-  }
-
-  .user-note {
-    margin: 0 0.75em 0.6em 0;
   }
 }
 
@@ -301,28 +355,94 @@
   display: none;
 }
 
-.user-counts {
-  display: flex;
-  line-height: 16px;
-  padding: 0.5em 1.5em 0;
-  text-align: center;
-  justify-content: space-between;
-  flex-wrap: wrap;
+.user-extras {
+  padding: 1.2em 0.6em;
+  line-height: 1.5;
+
+  .user-stats {
+    display: block;
+    text-align: center;
+    word-wrap: break-word;
+    width: 100%;
+
+    dl {
+      display: inline;
+      margin-right: 1em;
+      white-space: nowrap;
+    }
+
+    dd {
+      font-weight: bolder;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      margin: 0;
+    }
+
+    dd, dt {
+      display: inline
+    }
+
+    /* stylelint-disable-next-line no-descending-specificity */
+    a {
+      text-decoration: none;
+    }
+  }
+
+  .birthday {
+    width: 100%;
+    text-align: center;
+    white-space: nowrap;
+
+    --icon: var(--text);
+  }
 }
 
-.user-count {
-  flex: 1 0 auto;
-  padding: 0.5em 0;
+.user-profile-fields {
   margin: 0 0.5em;
 
-  h5 {
-    font-size: 1em;
-    font-weight: bolder;
-    margin: 0 0 0.25em;
+  img {
+    object-fit: contain;
+    vertical-align: middle;
+    max-width: 100%;
+    max-height: 400px;
+
+    &.emoji {
+      width: 18px;
+      height: 18px;
+    }
   }
 
-  /* stylelint-disable-next-line no-descending-specificity */
-  a {
-    text-decoration: none;
+  .user-profile-field {
+    display: flex;
+    margin: 0.25em;
+    border: 1px solid var(--border);
+    border-radius: var(--roundness);
+
+    .user-profile-field-name,
+    .user-profile-field-value {
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      box-sizing: border-box;
+      line-height: 2em;
+    }
+
+    .user-profile-field-name {
+      flex: 0 1 50%;
+      font-weight: 600;
+      text-align: right;
+      color: var(--lightText);
+      min-width: 9em;
+      border-right: 1px solid var(--border);
+      padding-left: 1.2em;
+      padding-right: 0.6em;
+    }
+
+    .user-profile-field-value {
+      flex: 1 1 55%;
+      color: var(--text);
+      padding-left: 0.6em;
+      margin: 0;
+    }
   }
 }
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index e51a16271..9c62359c9 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -4,13 +4,16 @@
     :class="classes"
   >
     <div
-      :class="{ 'hide-bio': hideBio }"
-      :style="style"
-      class="background-image"
-    />
-    <div :class="onClose ? '' : 'panel-heading -flexible-height'">
+      :class="onClose ? '' : 'panel-heading -flexible-height'"
+      class="user-card-inner"
+    >
       <div class="user-info">
-        <div class="container">
+        <div class="user-identity">
+          <div
+            :class="{ 'hide-bio': hideBio }"
+            :style="style"
+            class="background-image"
+          />
           <a
             v-if="avatarAction === 'zoom'"
             class="user-info-avatar -link"
@@ -32,12 +35,64 @@
           />
           <router-link
             v-else
+            class="user-info-avatar"
             :to="userProfileLink(user)"
           >
             <UserAvatar :user="user" />
           </router-link>
           <div class="user-summary">
             <div class="top-line">
+              <div class="other-actions">
+                <button
+                  v-if="!isOtherUser && user.is_local"
+                  class="button-unstyled edit-profile-button"
+                  @click.stop="openProfileTab"
+                >
+                  <FAIcon
+                    fixed-width
+                    class="icon"
+                    icon="edit"
+                    :title="$t('user_card.edit_profile')"
+                  />
+                </button>
+                <a
+                  v-if="isOtherUser && !user.is_local"
+                  :href="user.statusnet_profile_url"
+                  target="_blank"
+                  class="button-unstyled external-link-button"
+                >
+                  <FAIcon
+                    class="icon"
+                    icon="external-link-alt"
+                  />
+                </a>
+                <AccountActions
+                  v-if="isOtherUser && loggedIn"
+                  :user="user"
+                  :relationship="relationship"
+                />
+                <router-link
+                  v-if="onClose"
+                  :to="userProfileLink(user)"
+                  class="button-unstyled external-link-button"
+                  @click="onClose"
+                >
+                  <FAIcon
+                    class="icon"
+                    icon="expand-alt"
+                  />
+                </router-link>
+                <button
+                  v-if="onClose"
+                  class="button-unstyled external-link-button"
+                  @click="onClose"
+                >
+                  <FAIcon
+                    class="icon"
+                    icon="times"
+                  />
+                </button>
+              </div>
               <router-link
                 :to="userProfileLink(user)"
                 class="user-name"
@@ -48,61 +103,27 @@
                   :emoji="user.emoji"
                 />
               </router-link>
-              <button
-                v-if="!isOtherUser && user.is_local"
-                class="button-unstyled edit-profile-button"
-                @click.stop="openProfileTab"
-              >
-                <FAIcon
-                  fixed-width
-                  class="icon"
-                  icon="edit"
-                  :title="$t('user_card.edit_profile')"
-                />
-              </button>
-              <a
-                v-if="isOtherUser && !user.is_local"
-                :href="user.statusnet_profile_url"
-                target="_blank"
-                class="button-unstyled external-link-button"
-              >
-                <FAIcon
-                  class="icon"
-                  icon="external-link-alt"
-                />
-              </a>
-              <AccountActions
-                v-if="isOtherUser && loggedIn"
-                :user="user"
-                :relationship="relationship"
-              />
-              <router-link
-                v-if="onClose"
-                :to="userProfileLink(user)"
-                class="button-unstyled external-link-button"
-                @click="onClose"
-              >
-                <FAIcon
-                  class="icon"
-                  icon="expand-alt"
-                />
-              </router-link>
-              <button
-                v-if="onClose"
-                class="button-unstyled external-link-button"
-                @click="onClose"
-              >
-                <FAIcon
-                  class="icon"
-                  icon="times"
-                />
-              </button>
             </div>
             <div class="bottom-line">
               <user-link
                 class="user-screen-name"
                 :user="user"
               />
+              <span
+                v-if="user.locked"
+                class="lock-icon"
+              >
+                <FAIcon
+                  icon="lock"
+                  size="sm"
+                />
+              </span>
+              <span
+                v-if="relationship.followed_by && loggedIn && isOtherUser"
+                class="alert neutral user-role"
+              >
+                {{ $t('user_card.follows_you') }}
+              </span>
               <template v-if="!hideBio">
                 <span
                   v-if="user.deactivated"
@@ -128,80 +149,22 @@
                 >
                   {{ $t('user_card.group') }}
                 </span>
+                <span
+                  v-if="relationship.muting && muteExpiryAvailable"
+                  class="alert neutral user-role"
+                >
+                  {{ muteExpiry }}
+                </span>
+                <span
+                  v-if="relationship.blocking && blockExpiryAvailable"
+                  class="alert neutral user-role"
+                >
+                  {{ blockExpiry }}
+                </span>
               </template>
-              <span v-if="user.locked">
-                <FAIcon
-                  class="lock-icon"
-                  icon="lock"
-                  size="sm"
-                />
-              </span>
-              <span
-                v-if="relationship.muting && muteExpiryAvailable"
-                class="alert neutral user-role"
-              >
-                {{ muteExpiry }}
-              </span>
-              <span
-                v-if="relationship.blocking && blockExpiryAvailable"
-                class="alert neutral user-role"
-              >
-                {{ blockExpiry }}
-              </span>
-              <span
-                v-if="!mergedConfig.hideUserStats && !hideBio"
-                class="dailyAvg"
-              >{{ dailyAvg }} {{ $t('user_card.per_day') }}</span>
             </div>
           </div>
         </div>
-        <div class="user-meta">
-          <div
-            v-if="relationship.followed_by && loggedIn && isOtherUser"
-            class="following"
-          >
-            {{ $t('user_card.follows_you') }}
-          </div>
-          <div
-            v-if="isOtherUser && (loggedIn || !switcher)"
-            class="highlighter"
-          >
-            <!-- id's need to be unique, otherwise vue confuses which user-card checkbox belongs to -->
-            <input
-              v-if="userHighlightType !== 'disabled'"
-              :id="'userHighlightColorTx'+user.id"
-              v-model="userHighlightColor"
-              class="input userHighlightText"
-              type="text"
-            >
-            <input
-              v-if="userHighlightType !== 'disabled'"
-              :id="'userHighlightColor'+user.id"
-              v-model="userHighlightColor"
-              class="input userHighlightCl"
-              type="color"
-            >
-            {{ ' ' }}
-            <Select
-              :id="'userHighlightSel'+user.id"
-              v-model="userHighlightType"
-              class="userHighlightSel"
-            >
-              <option value="disabled">
-                {{ $t('user_card.highlight.disabled') }}
-              </option>
-              <option value="solid">
-                {{ $t('user_card.highlight.solid') }}
-              </option>
-              <option value="striped">
-                {{ $t('user_card.highlight.striped') }}
-              </option>
-              <option value="side">
-                {{ $t('user_card.highlight.side') }}
-              </option>
-            </Select>
-          </div>
-        </div>
         <div
           v-if="loggedIn && isOtherUser"
           class="user-interactions"
@@ -241,35 +204,32 @@
               </ProgressButton>
             </template>
           </div>
-          <div>
-            <button
-              v-if="relationship.muting"
-              class="btn button-default btn-mute toggled"
-              :disabled="user.deactivated"
-              @click="unmuteUser"
-            >
-              {{ $t('user_card.muted') }}
-            </button>
-            <button
-              v-else
-              class="btn button-default btn-mute"
-              :disabled="user.deactivated"
-              @click="muteUser"
-            >
-              {{ $t('user_card.mute') }}
-            </button>
-          </div>
-          <div>
-            <button
-              class="btn button-default btn-mention"
-              :disabled="user.deactivated"
-              @click="mentionUser"
-            >
-              {{ $t('user_card.mention') }}
-            </button>
-          </div>
+          <button
+            v-if="relationship.muting"
+            class="btn button-default btn-mute toggled"
+            :disabled="user.deactivated"
+            @click="unmuteUser"
+          >
+            {{ $t('user_card.muted') }}
+          </button>
+          <button
+            v-else
+            class="btn button-default btn-mute"
+            :disabled="user.deactivated"
+            @click="muteUser"
+          >
+            {{ $t('user_card.mute') }}
+          </button>
+          <button
+            class="btn button-default btn-mention"
+            :disabled="user.deactivated"
+            @click="mentionUser"
+          >
+            {{ $t('user_card.mention') }}
+          </button>
           <ModerationTools
             v-if="showModerationMenu"
+            class="moderation-menu"
             :user="user"
           />
         </div>
@@ -279,57 +239,148 @@
         >
           <RemoteFollow :user="user" />
         </div>
-        <UserNote
-          v-if="loggedIn && isOtherUser && (hasNote || (hasNoteEditor && supportsNote))"
-          :user="user"
-          :relationship="relationship"
-          :editable="hasNoteEditor"
-        />
       </div>
     </div>
     <div
-      v-if="!hideBio"
-      class="user-bio"
+      v-if="loggedIn && isOtherUser && (hasNote || !hideBio) && !mergedConfig.userCardHidePersonalMarks"
+      class="personal-marks"
     >
+      <UserNote
+        v-if="hasNote || (hasNoteEditor && supportsNote)"
+        :user="user"
+        :relationship="relationship"
+        :editable="hasNoteEditor"
+      />
       <div
-        v-if="!mergedConfig.hideUserStats && switcher"
-        class="user-counts"
+        v-if="!hideBio"
+        class="highlighter"
       >
-        <div
+        <h4>{{ $t('user_card.highlight_header') }}</h4>
+        <Select
+          :id="'userHighlightSel'+user.id"
+          v-model="userHighlightType"
+          class="userHighlightSel unstyled"
+          :class="{ '-none': userHighlightType === 'disabled' }"
+        >
+          <option value="disabled">
+            {{ $t('user_card.highlight_new.disabled') }}
+          </option>
+          <option value="solid">
+            {{ $t('user_card.highlight_new.solid') }}
+          </option>
+          <option value="striped">
+            {{ $t('user_card.highlight_new.striped') }}
+          </option>
+          <option value="side">
+            {{ $t('user_card.highlight_new.side') }}
+          </option>
+        </Select>
+        <!-- id's need to be unique, otherwise vue confuses which user-card checkbox belongs to -->
+        <ColorInput
+          v-if="userHighlightType !== 'disabled'"
+          v-model="userHighlightColor"
+          class="highlighter-color"
+          :show-optional-checkbox="false"
+          name="'userHighlightColorTx'+user.id"
+          :unstyled="true"
+        />
+      </div>
+    </div>
+    <RichContent
+      v-if="!hideBio"
+      class="user-card-bio"
+      :class="{ '-justify-left': mergedConfig.userCardLeftJustify }"
+      :html="user.description_html"
+      :emoji="user.emoji"
+      :handle-links="true"
+    />
+    <div
+      v-if="!hideBio && user.fields_html && user.fields_html.length > 0"
+      class="user-profile-fields"
+    >
+      <dl
+        v-for="(field, index) in user.fields_html"
+        :key="index"
+        class="user-profile-field"
+      >
+        <dt
+          :title="user.fields_text[index].name"
+          class="user-profile-field-name"
+        >
+          <RichContent
+            :html="field.name"
+            :emoji="user.emoji"
+          />
+        </dt>
+        <dd
+          :title="user.fields_text[index].value"
+          class="user-profile-field-value"
+        >
+          <RichContent
+            :html="field.value"
+            :emoji="user.emoji"
+          />
+        </dd>
+      </dl>
+    </div>
+    <div
+      v-if="!hideBio"
+      class="user-extras"
+    >
+      <span
+        v-if="!mergedConfig.hideUserStats"
+        class="user-stats"
+      >
+        <dl
+          v-if="!mergedConfig.hideUserStats && !hideBio"
           class="user-count"
           @click.prevent="setProfileView('statuses')"
         >
-          <h5>{{ $t('user_card.statuses') }}</h5>
-          <span>{{ user.statuses_count }} <br></span>
-        </div>
-        <div
+          <dd>{{ user.statuses_count }}</dd>
+          {{ ' ' }}
+          <dt>{{ $t('user_card.statuses') }}</dt>
+        </dl>
+        <dl
+          class="user-count"
+          @click.prevent="setProfileView('statuses')"
+        >
+          <dd>{{ dailyAvg }}</dd>
+          {{ ' ' }}
+          <dt>{{ $t('user_card.statuses_per_day') }}</dt>
+        </dl>
+        <dl
           class="user-count"
           @click.prevent="setProfileView('friends')"
         >
-          <h5>{{ $t('user_card.followees') }}</h5>
-          <span>{{ hideFollowsCount ? $t('user_card.hidden') : user.friends_count }}</span>
-        </div>
-        <div
+          <dd>{{ hideFollowsCount ? $t('user_card.hidden') : user.friends_count }}</dd>
+          {{ ' ' }}
+          <dt>{{ $t('user_card.followees') }}</dt>
+        </dl>
+        <dl
           class="user-count"
           @click.prevent="setProfileView('followers')"
         >
-          <h5>{{ $t('user_card.followers') }}</h5>
-          <span>{{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}</span>
-        </div>
+          <dd>{{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}</dd>
+          {{ ' ' }}
+          <dt>{{ $t('user_card.followers') }}</dt>
+        </dl>
+      </span>
+      <div
+        v-if="!hideBio && !!user.birthday"
+        class="birthday"
+      >
+        <FAIcon
+          class="fa-old-padding"
+          icon="birthday-cake"
+        />
+        {{ $t('user_card.birthday', { birthday: formattedBirthday }) }}
       </div>
-      <RichContent
-        v-if="!hideBio"
-        class="user-card-bio"
-        :html="user.description_html"
-        :emoji="user.emoji"
-        :handle-links="true"
-      />
     </div>
     <teleport to="#modal">
       <UserTimedFilterModal
+        ref="timedMuteDialog"
         :user="user"
         :is-mute="true"
-        ref="timedMuteDialog"
       />
     </teleport>
   </div>
diff --git a/src/components/user_note/user_note.js b/src/components/user_note/user_note.js
index 830b2e594..e5ead513c 100644
--- a/src/components/user_note/user_note.js
+++ b/src/components/user_note/user_note.js
@@ -1,19 +1,24 @@
+import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
+
 const UserNote = {
   props: {
     user: Object,
     relationship: Object,
     editable: Boolean
   },
+  components: {
+    PanelLoading
+  },
   data () {
     return {
-      localNote: '',
+      localNote: this.relationship.note,
       editing: false,
       frozen: false
     }
   },
-  computed: {
-    shouldShow () {
-      return this.relationship.note || this.editing
+  watch: {
+    relationship () {
+      this.localNote = this.relationship.note
     }
   },
   methods: {
@@ -21,9 +26,6 @@ const UserNote = {
       this.localNote = this.relationship.note
       this.editing = true
     },
-    cancelEditing () {
-      this.editing = false
-    },
     finalizeEditing () {
       this.frozen = true
 
@@ -37,6 +39,7 @@ const UserNote = {
         })
         .catch(() => {
           this.frozen = false
+          this.editing = false
         })
     }
   }
diff --git a/src/components/user_note/user_note.vue b/src/components/user_note/user_note.vue
index e175ced00..8c4ec3662 100644
--- a/src/components/user_note/user_note.vue
+++ b/src/components/user_note/user_note.vue
@@ -1,46 +1,23 @@
 <template>
   <div
     class="user-note"
+    :class="{ '-frozen': frozen }"
   >
-    <div class="heading">
-      <span>{{ $t('user_card.note') }}</span>
-      <div class="buttons">
-        <button
-          v-show="!editing && editable"
-          class="button-default btn"
-          @click="startEditing"
-        >
-          {{ $t('user_card.edit_note') }}
-        </button>
-        <button
-          v-show="editing"
-          class="button-default btn"
-          :disabled="frozen"
-          @click="finalizeEditing"
-        >
-          {{ $t('user_card.edit_note_apply') }}
-        </button>
-        <button
-          v-show="editing"
-          class="button-default btn"
-          :disabled="frozen"
-          @click="cancelEditing"
-        >
-          {{ $t('user_card.edit_note_cancel') }}
-        </button>
-      </div>
-    </div>
+    <h4>{{ $t('user_card.personal_note') }}</h4>
     <textarea
-      v-show="editing"
       v-model="localNote"
       class="input note-text"
+      :class="{ unstyled: !editing }"
+      rows="1"
+      :placeholder="$t('user_card.note_blank_click')"
+      @focus="startEditing"
+      @blur="finalizeEditing"
     />
     <span
-      v-show="!editing"
-      class="note-text"
-      :class="{ '-blank': !relationship.note }"
+      v-if="frozen"
+      class="overlay"
     >
-      {{ relationship.note || $t('user_card.note_blank') }}
+      <PanelLoading />
     </span>
   </div>
 </template>
@@ -49,38 +26,27 @@
 
 <style lang="scss">
 .user-note {
-  display: flex;
-  flex-direction: column;
+  position: relative;
 
-  .heading {
-    display: flex;
-    flex-direction: row;
+  h4 {
     justify-content: space-between;
-    align-items: center;
-    margin-bottom: 0.75em;
-
-    .btn {
-      min-width: 95px;
-    }
-
-    .buttons {
-      display: flex;
-      flex-direction: row;
-      justify-content: right;
-
-      .btn {
-        margin-left: 0.5em;
-      }
-    }
+    margin-bottom: 0.5em;
   }
 
   .note-text {
     align-self: stretch;
+    min-width: 100%;
+    margin: -0.6em;
   }
 
-  .note-text.-blank {
-    font-style: italic;
-    color: var(--textFaint);
+  .overlay {
+    position: absolute;
+    inset: 0;
+    background-color: rgb(0 0 0 / 30%);
+
+    .panel-loading {
+      font-size: 1em;
+    }
   }
 }
 </style>
diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue
index 9323b65e7..7ac4d429c 100644
--- a/src/components/user_panel/user_panel.vue
+++ b/src/components/user_panel/user_panel.vue
@@ -28,8 +28,16 @@
     backdrop-filter: var(--backdrop-filter);
   }
 
+  .user-info {
+    .Avatar {
+      width: 5em;
+      width: calc(min(5em, 20cqw));
+      height: 5em;
+      height: calc(min(5em, 20cqw));
+    }
+  }
+
   .signed-in {
-    overflow: visible;
     z-index: 10;
   }
 }
diff --git a/src/components/user_popover/user_popover.vue b/src/components/user_popover/user_popover.vue
index 413b254cc..9bff355e9 100644
--- a/src/components/user_popover/user_popover.vue
+++ b/src/components/user_popover/user_popover.vue
@@ -26,7 +26,22 @@
 <style lang="scss">
 /* popover styles load on-demand, so we need to override */
 /* stylelint-disable block-no-empty */
-.user-popover.popover {
+.user-popover {
+  margin-bottom: 0.6em;
+
+  .user-identity {
+    aspect-ratio: unset;
+    min-width: calc(min(30em, 98vw));
+  }
+
+  .user-card-inner {
+    display: flex;
+  }
+
+  &.popover {
+    overflow: hidden;
+    padding: 0.6em;
+  }
 }
 /* stylelint-enable block-no-empty */
 
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 49d6fd60a..a65f1b5ea 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -7,16 +7,13 @@ import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import List from '../list/list.vue'
 import withLoadMore from '../../hocs/with_load_more/with_load_more'
-import localeService from 'src/services/locale/locale.service.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faCircleNotch,
-  faBirthdayCake
+  faCircleNotch
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faCircleNotch,
-  faBirthdayCake
+  faCircleNotch
 )
 
 const FollowerList = withLoadMore({
@@ -82,10 +79,6 @@ const UserProfile = {
     },
     favoritesTabVisible () {
       return this.isUs || (this.$store.state.instance.pleromaPublicFavouritesAvailable && !this.user.hide_favorites)
-    },
-    formattedBirthday () {
-      const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale)
-      return this.user.birthday && new Date(Date.parse(this.user.birthday)).toLocaleDateString(browserLocale, { timeZone: 'UTC', day: 'numeric', month: 'long', year: 'numeric' })
     }
   },
   methods: {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index f64da4a45..749b828b8 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -13,45 +13,6 @@
           rounded="top"
           :has-note-editor="true"
         />
-        <span
-          v-if="!!user.birthday"
-          class="user-birthday"
-        >
-          <FAIcon
-            class="fa-old-padding"
-            icon="birthday-cake"
-          />
-          {{ $t('user_card.birthday', { birthday: formattedBirthday }) }}
-        </span>
-        <div
-          v-if="user.fields_html && user.fields_html.length > 0"
-          class="user-profile-fields"
-        >
-          <dl
-            v-for="(field, index) in user.fields_html"
-            :key="index"
-            class="user-profile-field"
-          >
-            <dt
-              :title="user.fields_text[index].name"
-              class="user-profile-field-name"
-            >
-              <RichContent
-                :html="field.name"
-                :emoji="user.emoji"
-              />
-            </dt>
-            <dd
-              :title="user.fields_text[index].value"
-              class="user-profile-field-value"
-            >
-              <RichContent
-                :html="field.value"
-                :emoji="user.emoji"
-              />
-            </dd>
-          </dl>
-        </div>
       </div>
       <tab-switcher
         :active-tab="tab"
@@ -173,58 +134,6 @@
   // No sticky header on user profile
   --currentPanelStack: 0;
 
-  .user-birthday {
-    margin: 0 0.75em 0.5em;
-  }
-
-  .user-profile-fields {
-    margin: 0 0.5em;
-
-    img {
-      object-fit: contain;
-      vertical-align: middle;
-      max-width: 100%;
-      max-height: 400px;
-
-      &.emoji {
-        width: 18px;
-        height: 18px;
-      }
-    }
-
-    .user-profile-field {
-      display: flex;
-      margin: 0.25em;
-      border: 1px solid var(--border);
-      border-radius: var(--roundness);
-
-      .user-profile-field-name {
-        flex: 0 1 30%;
-        font-weight: 500;
-        text-align: right;
-        color: var(--lightText);
-        min-width: 120px;
-        border-right: 1px solid var(--border);
-      }
-
-      .user-profile-field-value {
-        flex: 1 1 70%;
-        color: var(--text);
-        margin: 0 0 0 0.25em;
-      }
-
-      .user-profile-field-name,
-      .user-profile-field-value {
-        line-height: 1.3;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        padding: 0.5em 1.5em;
-        box-sizing: border-box;
-      }
-    }
-  }
-
   .userlist-placeholder {
     display: flex;
     justify-content: center;
diff --git a/src/components/user_timed_filter_modal/user_timed_filter_modal.vue b/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
index 8fcf6eed8..91c05ad77 100644
--- a/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
+++ b/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
@@ -8,17 +8,16 @@
     @accepted="accept"
     @cancelled="cancel"
   >
-
     <p>
       {{ $t(isMute ? 'user_card.expire_mute_message' : 'user_card.expire_block_message', [user.screen_name]) }}
     </p>
     <p>
-    {{ $t('user_card.expire_in') }}
+      {{ $t('user_card.expire_in') }}
       <input
         id="userFilterExpires"
+        v-model="expiration"
         class="input input-expire-in"
         :class="{ disabled: forever }"
-        v-model="expiration"
         :disabled="forever"
         min="1"
         type="number"
@@ -29,10 +28,30 @@
         class="input unit-input unstyled"
         :disabled="forever"
       >
-        <option key="s" value="s"> {{ $t('time.unit.seconds_suffix') }} </option>
-        <option key="m" value="m"> {{ $t('time.unit.minutes_suffix') }} </option>
-        <option key="h" value="h"> {{ $t('time.unit.hours_suffix') }} </option>
-        <option key="d" value="d"> {{ $t('time.unit.days_suffix') }} </option>
+        <option
+          key="s"
+          value="s"
+        >
+          {{ $t('time.unit.seconds_suffix') }}
+        </option>
+        <option
+          key="m"
+          value="m"
+        >
+          {{ $t('time.unit.minutes_suffix') }}
+        </option>
+        <option
+          key="h"
+          value="h"
+        >
+          {{ $t('time.unit.hours_suffix') }}
+        </option>
+        <option
+          key="d"
+          value="d"
+        >
+          {{ $t('time.unit.days_suffix') }}
+        </option>
       </Select>
 
       {{ $t('user_card.mute_or') }}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index e200eab4a..c963e9ba5 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -800,6 +800,8 @@
     "user_popover_avatar_action_close": "Close the popover",
     "user_popover_avatar_action_open": "Open profile",
     "user_popover_avatar_overlay": "Show user popover over user avatar",
+    "user_card_left_justify": "Justify user bio to the left",
+    "user_card_hide_personal_marks": "Hide personal marks (highlight/note) in user profiles",
     "fun": "Fun",
     "greentext": "Meme arrows",
     "show_yous": "Show (You)s",
@@ -1480,7 +1482,7 @@
     "block_expires_forever": "Blocked forever",
     "block_expires_at": "Blocked until {0}",
     "mute_duration_prompt": "Mute this user for (0 for indefinite time):",
-    "per_day": "per day",
+    "statuses_per_day": "Statuses per day",
     "remote_follow": "Remote follow",
     "remove_follower": "Remove follower",
     "remove_follower_confirm_title": "Remove follower confirmation",
@@ -1521,17 +1523,15 @@
       "delete_user": "Delete user",
       "delete_user_data_and_deactivate_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?"
     },
-    "highlight": {
-      "disabled": "No highlight",
-      "solid": "Solid bg",
-      "striped": "Striped bg",
+    "highlight_new": {
+      "disabled": "Don't highlight",
+      "solid": "Solid background",
+      "striped": "Striped background",
       "side": "Side stripe"
     },
-    "note": "Note",
-    "note_blank": "(None)",
-    "edit_note": "Edit note",
-    "edit_note_apply": "Apply",
-    "edit_note_cancel": "Cancel"
+    "personal_note": "Personal note",
+    "note_blank_click": "Click to add note",
+    "highlight_header": "Highlight user's posts and mentions"
   },
   "user_profile": {
     "timeline_title": "User timeline",
diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js
index 8ccf79e70..045cb407a 100644
--- a/src/modules/default_config_state.js
+++ b/src/modules/default_config_state.js
@@ -126,6 +126,8 @@ export const defaultState = {
   showScrollbars: false,
   userPopoverAvatarAction: 'open',
   userPopoverOverlay: false,
+  userCardLeftJustify: false,
+  userCardHidePersonalMarks: false,
   sidebarColumnWidth: '25rem',
   contentColumnWidth: '45rem',
   notifsColumnWidth: '25rem',
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 7d569f7cf..34aca1450 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -352,7 +352,7 @@ const unmuteConversation = ({ id, credentials }) => {
 const blockUser = ({ id, expiresIn, credentials }) => {
   const payload = {}
   if (expiresIn) {
-    payload.expires_in = expiresIn
+    payload.duration = expiresIn
   }
 
   return promisedRequest({
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index 89e000dd6..c7eed1858 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -18,8 +18,7 @@ const mastoApiNotificationTypes = new Set([
   'move',
   'poll',
   'pleroma:emoji_reaction',
-  'pleroma:report',
-  'test'
+  'pleroma:report'
 ])
 
 const fetchAndUpdate = ({ store, credentials, older = false, since }) => {