diff --git a/lib/themes/base_theme.dart b/lib/themes/base_theme.dart
index ebd243b..9bd5d70 100644
--- a/lib/themes/base_theme.dart
+++ b/lib/themes/base_theme.dart
@@ -13,10 +13,7 @@ final darkBaseTheme = ThemeData.dark(useMaterial3: true).copyWith(
   elevatedButtonTheme: ElevatedButtonThemeData(
     style: ElevatedButton.styleFrom(
         backgroundColor: onOnBackgroundColor,
-        side: const BorderSide(
-          width: 1,
-          color: buttonBorderColor,
-        ),
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30)),
         textStyle: const TextStyle(
           color: Colors.white,
         )),
diff --git a/lib/views/initial_setup_screen.dart b/lib/views/initial_setup_screen.dart
index ffb1a46..6fb4eef 100644
--- a/lib/views/initial_setup_screen.dart
+++ b/lib/views/initial_setup_screen.dart
@@ -14,39 +14,56 @@ class InitialSetupScreen extends AbstractView {
   InitialSetupScreen({super.key});
   @override
   Widget? body(BuildContext context) {
-    return Column(
-      children: [
-        Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 64.0, vertical: 16),
-            child: Assets.cakeLanding.lottie()),
-        Text(L.welcome_to),
-        const SizedBox(height: 8),
-        Text(
-          "Cupcake",
-          style: Theme.of(context).textTheme.displaySmall,
-        ),
-        const SizedBox(height: 8),
-        Text(L.cupcake_slogan),
-        const Spacer(),
-        const SizedBox(height: 8),
-        LongSecondaryButton(
-          text: L.create_new_wallet,
-          icon: Icons.add,
-          onPressed: () => CreateWallet.staticPush(
-            context,
-            CreateWalletViewModel(createMethod: CreateMethod.create),
-          ),
-        ),
-        LongPrimaryButton(
-          text: L.restore_wallet,
-          icon: Icons.restore,
-          onPressed: () => CreateWallet.staticPush(
-            context,
-            CreateWalletViewModel(createMethod: CreateMethod.restore),
-          ),
-        ),
-      ],
-    );
+    return SafeArea(
+        minimum: const EdgeInsets.only(bottom: 16),
+        child: Column(
+          children: [
+            Padding(
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 64.0, vertical: 24),
+                child: Assets.cakeLanding.lottie()),
+            Text(L.welcome_to,
+                style: Theme.of(context).textTheme.displaySmall?.copyWith(
+                      fontSize: 18,
+                      fontWeight: FontWeight.w500,
+                    )),
+            const SizedBox(height: 8),
+            Text(
+              "Cupcake",
+              style: Theme.of(context).textTheme.displayLarge?.copyWith(
+                    fontSize: 36,
+                    fontWeight: FontWeight.bold,
+                  ),
+            ),
+            //style: Theme.of(context).textTheme.displaySmall,
+            const SizedBox(height: 8),
+            Text(
+              L.cupcake_slogan,
+              style: Theme.of(context).textTheme.displaySmall?.copyWith(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w500,
+                  ),
+            ),
+            const Spacer(),
+            const SizedBox(height: 8),
+            LongSecondaryButton(
+              text: L.create_new_wallet,
+              icon: Icons.add,
+              onPressed: () => CreateWallet.staticPush(
+                context,
+                CreateWalletViewModel(createMethod: CreateMethod.create),
+              ),
+            ),
+            LongPrimaryButton(
+              text: L.restore_wallet,
+              icon: Icons.restore,
+              onPressed: () => CreateWallet.staticPush(
+                context,
+                CreateWalletViewModel(createMethod: CreateMethod.restore),
+              ),
+            ),
+          ],
+        ));
   }
 }
 
diff --git a/lib/views/wallet_home.dart b/lib/views/wallet_home.dart
index 8f51690..67150e3 100644
--- a/lib/views/wallet_home.dart
+++ b/lib/views/wallet_home.dart
@@ -5,7 +5,6 @@ import 'package:cup_cake/views/barcode_scanner.dart';
 import 'package:cup_cake/views/receive.dart';
 import 'package:cup_cake/views/widgets/cake_card.dart';
 import 'package:cup_cake/views/widgets/drawer_element.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cup_cake/gen/assets.gen.dart';
 
@@ -16,7 +15,7 @@ class WalletHome extends AbstractView {
 
   static Future<void> pushStatic(BuildContext context, CoinWallet coin) async {
     await Navigator.of(context).pushReplacement(
-      CupertinoPageRoute(
+      MaterialPageRoute(
         builder: (BuildContext context) {
           return WalletHome(coinWallet: coin);
         },
@@ -70,20 +69,26 @@ class WalletHome extends AbstractView {
   Widget? body(BuildContext context) {
     return Column(
       children: [
-        const SizedBox(height: 56),
+        const SizedBox(height: 40),
         CakeCard(
             child: Row(
           children: [
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(L.balance),
+                Text(
+                  L.balance,
+                  style: Theme.of(context)
+                      .textTheme
+                      .displaySmall!
+                      .copyWith(fontSize: 12, fontWeight: FontWeight.w400),
+                ),
                 Text(
                   viewModel.balance,
                   style: Theme.of(context)
                       .textTheme
                       .displaySmall!
-                      .copyWith(fontSize: 32),
+                      .copyWith(fontSize: 24, fontWeight: FontWeight.w900),
                 ),
               ],
             ),
@@ -95,7 +100,7 @@ class WalletHome extends AbstractView {
           ],
         )),
         CakeCard(
-          firmPadding: const EdgeInsets.all(8),
+          firmPadding: const EdgeInsets.all(12),
           child: Row(
             children: [
               Expanded(
@@ -108,7 +113,7 @@ class WalletHome extends AbstractView {
                         const Icon(Icons.inbox, size: 35, color: Colors.white),
                     label: Text(
                       L.receive,
-                      style: const TextStyle(color: Colors.white, fontSize: 20),
+                      style: const TextStyle(color: Colors.white, fontSize: 18),
                     ),
                   ),
                 ),
@@ -121,13 +126,13 @@ class WalletHome extends AbstractView {
                     onPressed: () =>
                         BarcodeScanner.pushStatic(context, viewModel.wallet),
                     icon: const Icon(
-                      Icons.qr_code_2,
+                      Icons.qr_code_rounded,
                       size: 35,
                       color: Colors.white,
                     ),
                     label: Text(
                       L.scan,
-                      style: const TextStyle(color: Colors.white, fontSize: 20),
+                      style: const TextStyle(color: Colors.white, fontSize: 18),
                     ),
                   ),
                 ),
diff --git a/lib/views/widgets/cake_card.dart b/lib/views/widgets/cake_card.dart
index 07c9f26..535b188 100644
--- a/lib/views/widgets/cake_card.dart
+++ b/lib/views/widgets/cake_card.dart
@@ -11,9 +11,9 @@ class CakeCard extends StatelessWidget {
         right: 24,
       ),
       this.externalPadding = const EdgeInsets.only(
-        top: 8,
+        top: 4,
         left: 16.0,
-        bottom: 8,
+        bottom: 4,
         right: 16,
       ),
       this.firmPadding =
@@ -31,7 +31,7 @@ class CakeCard extends StatelessWidget {
         width: double.maxFinite,
         child: Card(
           shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(32.0),
+            borderRadius: BorderRadius.circular(30.0),
           ),
           child: Padding(
             padding: firmPadding,