diff --git a/playwright/widget/test-helpers.ts b/playwright/widget/test-helpers.ts
index b47588ce..9167412e 100644
--- a/playwright/widget/test-helpers.ts
+++ b/playwright/widget/test-helpers.ts
@@ -122,6 +122,7 @@ export class TestHelpers {
 
     await this.maybeDismissBrowserNotSupportedToast(page);
     await this.maybeDismissServiceWorkerWarningToast(page);
+    await this.maybeDismissBackupChat(page);
 
     await TestHelpers.setDevToolElementCallDevUrl(page);
 
@@ -170,6 +171,22 @@ export class TestHelpers {
     }
   }
 
+  private static async maybeDismissBackupChat(page: Page): Promise<void> {
+    const toast = page
+      .locator(".mx_Toast_toast")
+      .getByText("Back up your chats");
+
+    try {
+      await expect(toast).toBeVisible({ timeout: 700 });
+      await page
+        .locator(".mx_Toast_toast")
+        .getByRole("button", { name: "Dismiss" })
+        .click();
+    } catch {
+      // toast not visible, continue as normal
+    }
+  }
+
   public static async maybeDismissKeyBackupToast(page: Page): Promise<void> {
     const toast = page
       .locator(".mx_Toast_toast")
diff --git a/src/RTCConnectionStats.tsx b/src/RTCConnectionStats.tsx
index f62a1e4d..ea9df3f5 100644
--- a/src/RTCConnectionStats.tsx
+++ b/src/RTCConnectionStats.tsx
@@ -87,7 +87,7 @@ export const RTCConnectionStats: FC<Props> = ({
         <div>
           <Button
             onClick={() => showFullModal("audio")}
-            size="sm"
+            size="md"
             kind="tertiary"
             Icon={MicOnSolidIcon}
           >
@@ -103,7 +103,7 @@ export const RTCConnectionStats: FC<Props> = ({
         <div>
           <Button
             onClick={() => showFullModal("video")}
-            size="sm"
+            size="md"
             kind="tertiary"
             Icon={VideoCallSolidIcon}
           >
diff --git a/src/button/Button.tsx b/src/button/Button.tsx
index 8a22668e..40360ce9 100644
--- a/src/button/Button.tsx
+++ b/src/button/Button.tsx
@@ -32,7 +32,7 @@ import { platform } from "../Platform";
 
 interface MicButtonProps extends ComponentPropsWithoutRef<"button"> {
   enabled: boolean;
-  size?: "sm" | "lg";
+  size?: "md" | "lg";
 }
 
 export const MicButton: FC<MicButtonProps> = ({ enabled, ...props }) => {
@@ -58,7 +58,7 @@ export const MicButton: FC<MicButtonProps> = ({ enabled, ...props }) => {
 
 interface VideoButtonProps extends ComponentPropsWithoutRef<"button"> {
   enabled: boolean;
-  size?: "sm" | "lg";
+  size?: "md" | "lg";
 }
 
 export const VideoButton: FC<VideoButtonProps> = ({ enabled, ...props }) => {
@@ -84,7 +84,7 @@ export const VideoButton: FC<VideoButtonProps> = ({ enabled, ...props }) => {
 
 interface ShareScreenButtonProps extends ComponentPropsWithoutRef<"button"> {
   enabled: boolean;
-  size: "sm" | "lg";
+  size: "md" | "lg";
 }
 
 export const ShareScreenButton: FC<ShareScreenButtonProps> = ({
@@ -111,7 +111,7 @@ export const ShareScreenButton: FC<ShareScreenButtonProps> = ({
 };
 
 interface EndCallButtonProps extends ComponentPropsWithoutRef<"button"> {
-  size?: "sm" | "lg";
+  size?: "md" | "lg";
 }
 
 export const EndCallButton: FC<EndCallButtonProps> = ({
@@ -134,7 +134,7 @@ export const EndCallButton: FC<EndCallButtonProps> = ({
 };
 
 interface LoudspeakerButtonProps extends ComponentPropsWithoutRef<"button"> {
-  size?: "sm" | "lg";
+  size?: "md" | "lg";
   loudspeakerModeEnabled: boolean;
 }
 export const LoudspeakerButton: FC<LoudspeakerButtonProps> = ({
@@ -195,7 +195,7 @@ export const SettingsIconButton: FC<SettingsIconButtonProps> = ({
 };
 
 interface SettingsButtonProps extends ComponentPropsWithoutRef<"button"> {
-  size?: "sm" | "lg";
+  size?: "md" | "lg";
   /** If this buttons should be setup to be used in the app bar */
   showForScreenWidth?: "wide" | "narrow";
 }
diff --git a/src/button/InviteButton.tsx b/src/button/InviteButton.tsx
index 305ef4f3..66ff57e2 100644
--- a/src/button/InviteButton.tsx
+++ b/src/button/InviteButton.tsx
@@ -15,7 +15,7 @@ export const InviteButton: FC<
 > = (props) => {
   const { t } = useTranslation();
   return (
-    <Button kind="secondary" size="sm" Icon={UserAddIcon} {...props}>
+    <Button kind="secondary" size="md" Icon={UserAddIcon} {...props}>
       {t("action.invite")}
     </Button>
   );
diff --git a/src/button/ReactionToggleButton.tsx b/src/button/ReactionToggleButton.tsx
index 39804a5f..c71642e9 100644
--- a/src/button/ReactionToggleButton.tsx
+++ b/src/button/ReactionToggleButton.tsx
@@ -173,7 +173,7 @@ export interface ReactionData {
 interface ReactionToggleButtonProps extends ComponentPropsWithoutRef<"button"> {
   reactionData: ReactionData;
   identifier: string;
-  size?: "sm" | "lg";
+  size?: "md" | "lg";
   /** List of participants raising their hand */
 }
 
diff --git a/src/components/CallFooter.tsx b/src/components/CallFooter.tsx
index d10e4ecf..a395a389 100644
--- a/src/components/CallFooter.tsx
+++ b/src/components/CallFooter.tsx
@@ -106,7 +106,7 @@ export const CallFooter: FC<FooterProps> = ({
   tileStoreGeneration,
 }) => {
   const buttons: JSX.Element[] = [];
-  const buttonSize = asPip ? "sm" : "lg";
+  const buttonSize = asPip ? "md" : "lg";
   const showSettingsButton =
     openSettings !== undefined && !asPip && !hideControls;
   const showLayoutSwitcher = !asPip && !hideControls;
diff --git a/src/input/AvatarInputField.tsx b/src/input/AvatarInputField.tsx
index 4a3173b4..f9b14707 100644
--- a/src/input/AvatarInputField.tsx
+++ b/src/input/AvatarInputField.tsx
@@ -113,7 +113,7 @@ export const AvatarInputField: FC<Props> = ({
                 iconOnly
                 Icon={EditIcon}
                 kind="tertiary"
-                size="sm"
+                size="md"
                 aria-label={t("action.edit")}
               />
             }
@@ -136,7 +136,7 @@ export const AvatarInputField: FC<Props> = ({
             iconOnly
             Icon={EditIcon}
             kind="tertiary"
-            size="sm"
+            size="md"
             aria-label={t("action.edit")}
             onClick={onSelectUpload}
           />
diff --git a/src/room/EarpieceOverlay.tsx b/src/room/EarpieceOverlay.tsx
index 6835bdd7..574792f0 100644
--- a/src/room/EarpieceOverlay.tsx
+++ b/src/room/EarpieceOverlay.tsx
@@ -30,7 +30,7 @@ export const EarpieceOverlay: FC<Props> = ({ show, onBackToVideoPressed }) => {
       <Text>{t("handset.overlay_description")}</Text>
       <Button
         kind="primary"
-        size="sm"
+        size="md"
         onClick={() => {
           onBackToVideoPressed?.();
         }}
diff --git a/src/room/LobbyView.tsx b/src/room/LobbyView.tsx
index 367dc8df..65ca00c1 100644
--- a/src/room/LobbyView.tsx
+++ b/src/room/LobbyView.tsx
@@ -209,7 +209,7 @@ export const LobbyView: FC<Props> = ({
               className={classNames(styles.join, {
                 [styles.wait]: waitingForInvite,
               })}
-              size={waitingForInvite ? "sm" : "lg"}
+              size={waitingForInvite ? "md" : "lg"}
               disabled={waitingForInvite}
               onClick={() => {
                 if (!waitingForInvite) onEnter();
diff --git a/src/room/__snapshots__/InCallView.test.tsx.snap b/src/room/__snapshots__/InCallView.test.tsx.snap
index 073279a7..e800fd8f 100644
--- a/src/room/__snapshots__/InCallView.test.tsx.snap
+++ b/src/room/__snapshots__/InCallView.test.tsx.snap
@@ -149,7 +149,7 @@ exports[`InCallView > rendering > renders 1`] = `
       <button
         class="_button_1nw83_8"
         data-kind="primary"
-        data-size="sm"
+        data-size="md"
         role="button"
         tabindex="0"
       >