diff --git a/lib/pages/onboarding/space_code_onboarding_view.dart b/lib/pages/onboarding/space_code_onboarding_view.dart
index e4de82b76..3a3437779 100644
--- a/lib/pages/onboarding/space_code_onboarding_view.dart
+++ b/lib/pages/onboarding/space_code_onboarding_view.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 
 import 'package:go_router/go_router.dart';
-import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pages/onboarding/space_code_onboarding.dart';
-import 'package:fluffychat/pangea/login/pages/pangea_login_scaffold.dart';
+import 'package:fluffychat/pangea/common/widgets/pangea_logo_svg.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 
 class SpaceCodeOnboardingView extends StatelessWidget {
   final SpaceCodeOnboardingState controller;
@@ -13,69 +13,70 @@ class SpaceCodeOnboardingView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return PangeaLoginScaffold(
-      customAppBar: AppBar(
-        title: ConstrainedBox(
-          constraints: const BoxConstraints(maxWidth: 450),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              BackButton(onPressed: Navigator.of(context).pop),
-              const SizedBox(width: 40.0),
-            ],
-          ),
-        ),
+    final theme = Theme.of(context);
+    return Scaffold(
+      appBar: AppBar(
+        leading: BackButton(onPressed: Navigator.of(context).pop),
         automaticallyImplyLeading: false,
       ),
-      showAppName: false,
-      mainAssetUrl: controller.profile?.avatarUrl,
-      children: [
-        Column(
-          spacing: 8.0,
-          children: [
-            Text(
-              L10n.of(context).welcomeUser(
-                controller.profile?.displayName ??
-                    controller.client.userID?.localpart ??
-                    "",
-              ),
-              style: Theme.of(
-                context,
-              ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+      body: SafeArea(
+        child: MaxWidthBody(
+          maxWidth: 300,
+          withScrolling: false,
+          showBorder: false,
+          child: Container(
+            alignment: .center,
+            padding: const EdgeInsets.symmetric(
+              vertical: 24.0,
+              horizontal: 16.0,
             ),
-            Text(
-              L10n.of(context).joinSpaceOnboardingDesc,
-              textAlign: TextAlign.center,
+            child: Column(
+              spacing: 32.0,
+              mainAxisSize: .min,
+              children: [
+                PangeaLogoSvg(width: 72),
+                Column(
+                  spacing: 12.0,
+                  mainAxisSize: .min,
+                  children: [
+                    Text(
+                      L10n.of(context).joinSpaceOnboardingDesc,
+                      style: theme.textTheme.titleLarge?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
+                      textAlign: .center,
+                    ),
+                    TextField(
+                      decoration: InputDecoration(
+                        hintText: L10n.of(context).enterCodeToJoin,
+                      ),
+                      controller: controller.codeController,
+                      onSubmitted: (_) => controller.submitCode(),
+                    ),
+                    ElevatedButton(
+                      onPressed: controller.codeController.text.isNotEmpty
+                          ? controller.submitCode
+                          : null,
+                      style: ElevatedButton.styleFrom(
+                        backgroundColor: theme.colorScheme.primaryContainer,
+                        foregroundColor: theme.colorScheme.onPrimaryContainer,
+                      ),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [Text(L10n.of(context).join)],
+                      ),
+                    ),
+                  ],
+                ),
+                TextButton(
+                  onPressed: () => context.go("/rooms"),
+                  child: Text(L10n.of(context).skipForNow),
+                ),
+              ],
             ),
-            TextField(
-              decoration: InputDecoration(
-                hintText: L10n.of(context).enterCodeToJoin,
-              ),
-              controller: controller.codeController,
-              onSubmitted: (_) => controller.submitCode,
-            ),
-            ElevatedButton(
-              onPressed: controller.codeController.text.isNotEmpty
-                  ? controller.submitCode
-                  : null,
-              style: ElevatedButton.styleFrom(
-                backgroundColor: Theme.of(context).colorScheme.primaryContainer,
-                foregroundColor: Theme.of(
-                  context,
-                ).colorScheme.onPrimaryContainer,
-              ),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [Text(L10n.of(context).join)],
-              ),
-            ),
-            TextButton(
-              child: Text(L10n.of(context).skipForNow),
-              onPressed: () => context.go("/rooms"),
-            ),
-          ],
+          ),
         ),
-      ],
+      ),
     );
   }
 }