diff --git a/src/components/common/Avatar.scss b/src/components/common/Avatar.scss
index 0ea0df502..414333922 100644
--- a/src/components/common/Avatar.scss
+++ b/src/components/common/Avatar.scss
@@ -3,7 +3,7 @@
   --color-user: var(--color-primary);
   --radius: 50%;
   --_size: 0px;
-  --_font-size: max(calc(var(--_size) / 2 - 2px), 0.75rem);
+  --_font-size: max(calc(var(--_size) / 2 - 2px), 0.5rem);
 
   flex: none;
   align-items: center;
diff --git a/src/components/common/ProfileInfo.module.scss b/src/components/common/ProfileInfo.module.scss
index 40626c27b..57f3e0ff9 100644
--- a/src/components/common/ProfileInfo.module.scss
+++ b/src/components/common/ProfileInfo.module.scss
@@ -50,6 +50,8 @@
   top: 0;
   bottom: 0;
 
+  overflow: hidden;
+
   > :global(.Transition) {
     width: 100%;
     height: 100%;
diff --git a/src/components/left/settings/Settings.scss b/src/components/left/settings/Settings.scss
index 557481bd8..a90643c8f 100644
--- a/src/components/left/settings/Settings.scss
+++ b/src/components/left/settings/Settings.scss
@@ -15,6 +15,7 @@
 
   .self-profile .ProfileInfo {
     margin: -0.5rem 0 0.75rem -0.5rem;
+    margin-inline-end: calc(min(var(--scrollbar-width) - 0.5rem, 0px));
   }
 }
 
diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index f980b77f5..98bd03d27 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -666,13 +666,15 @@ const Message: FC<OwnProps & StateProps> = ({
 
   useEffect(() => {
     const element = ref.current;
-    if (message.isDeleting && element) {
+    const isPartialAlbumDelete = message.isInAlbum && album?.messages.some((msg) => !msg.isDeleting);
+    if (message.isDeleting && element && !isPartialAlbumDelete) {
       if (animateSnap(element)) {
         setIsPlayingSnapAnimation(true);
       } else {
         setIsPlayingDeleteAnimation(true);
       }
     }
+  // eslint-disable-next-line react-hooks-static-deps/exhaustive-deps -- Only start animation on `isDeleting` change
   }, [message.isDeleting]);
 
   const textMessage = album?.hasMultipleCaptions ? undefined : (album?.captionMessage || message);
diff --git a/src/components/modals/gift/info/GiftInfoModal.tsx b/src/components/modals/gift/info/GiftInfoModal.tsx
index b2423c347..2308ad244 100644
--- a/src/components/modals/gift/info/GiftInfoModal.tsx
+++ b/src/components/modals/gift/info/GiftInfoModal.tsx
@@ -55,7 +55,7 @@ const GiftInfoModal = ({
 }: OwnProps & StateProps) => {
   const {
     closeGiftInfoModal,
-    changeGiftVisilibity,
+    changeGiftVisibility,
     convertGiftToStars,
     openChatWithInfo,
     focusMessage,
@@ -97,7 +97,7 @@ const GiftInfoModal = ({
 
   const handleTriggerVisibility = useLastCallback(() => {
     const { fromId, messageId, isUnsaved } = userGift!;
-    changeGiftVisilibity({ userId: fromId!, messageId: messageId!, shouldUnsave: !isUnsaved });
+    changeGiftVisibility({ userId: fromId!, messageId: messageId!, shouldUnsave: !isUnsaved });
     handleClose();
   });
 
diff --git a/src/components/story/hooks/useStoryPreloader.ts b/src/components/story/hooks/useStoryPreloader.ts
index c13973821..80ff8f8cd 100644
--- a/src/components/story/hooks/useStoryPreloader.ts
+++ b/src/components/story/hooks/useStoryPreloader.ts
@@ -9,7 +9,7 @@ import unloadVideo from '../../../util/browser/unloadVideo';
 import { preloadImage } from '../../../util/files';
 import * as mediaLoader from '../../../util/mediaLoader';
 import { getProgressiveUrl } from '../../../util/mediaLoader';
-import { makeProgressiveLoader } from '../../../util/progressieveLoader';
+import { makeProgressiveLoader } from '../../../util/progressiveLoader';
 import { pause } from '../../../util/schedulers';
 import { PRIMARY_VIDEO_MIME } from '../helpers/videoFormats';
 
diff --git a/src/global/actions/api/stars.ts b/src/global/actions/api/stars.ts
index ab2602415..56d816395 100644
--- a/src/global/actions/api/stars.ts
+++ b/src/global/actions/api/stars.ts
@@ -222,7 +222,7 @@ addActionHandler('fulfillStarsSubscription', async (global, actions, payload): P
   actions.loadStarStatus();
 });
 
-addActionHandler('changeGiftVisilibity', async (global, actions, payload): Promise<void> => {
+addActionHandler('changeGiftVisibility', async (global, actions, payload): Promise<void> => {
   const { userId, messageId, shouldUnsave } = payload;
 
   const user = selectUser(global, userId);
diff --git a/src/global/types/actions.ts b/src/global/types/actions.ts
index 86d26c27c..3863759b0 100644
--- a/src/global/types/actions.ts
+++ b/src/global/types/actions.ts
@@ -2302,7 +2302,7 @@ export interface ActionPayloads {
     userId: string;
     shouldRefresh?: boolean;
   };
-  changeGiftVisilibity: {
+  changeGiftVisibility: {
     userId: string;
     messageId: number;
     shouldUnsave?: boolean;
diff --git a/src/hooks/useStreaming.ts b/src/hooks/useStreaming.ts
index 500876d00..f46692f72 100644
--- a/src/hooks/useStreaming.ts
+++ b/src/hooks/useStreaming.ts
@@ -5,7 +5,7 @@ import { DEBUG } from '../config';
 import { requestMutation } from '../lib/fasterdom/fasterdom';
 import { applyStyles } from '../util/animation';
 import unloadVideo from '../util/browser/unloadVideo';
-import { makeProgressiveLoader } from '../util/progressieveLoader';
+import { makeProgressiveLoader } from '../util/progressiveLoader';
 import { IS_SAFARI } from '../util/windowEnvironment';
 
 const VIDEO_REVEAL_DELAY = 100;
diff --git a/src/util/progressieveLoader.ts b/src/util/progressiveLoader.ts
similarity index 100%
rename from src/util/progressieveLoader.ts
rename to src/util/progressiveLoader.ts