diff --git a/assets/images/2.0x/crypto_lock_light.png b/assets/images/2.0x/crypto_lock_light.png
new file mode 100644
index 000000000..2937b2012
Binary files /dev/null and b/assets/images/2.0x/crypto_lock_light.png differ
diff --git a/assets/images/3.0x/crypto_lock_light.png b/assets/images/3.0x/crypto_lock_light.png
new file mode 100644
index 000000000..9ec7964cf
Binary files /dev/null and b/assets/images/3.0x/crypto_lock_light.png differ
diff --git a/assets/images/crypto_lock_light.png b/assets/images/crypto_lock_light.png
new file mode 100644
index 000000000..5f3fb14a7
Binary files /dev/null and b/assets/images/crypto_lock_light.png differ
diff --git a/lib/src/screens/dashboard/widgets/wallet_card.dart b/lib/src/screens/dashboard/widgets/wallet_card.dart
index 6dcab17c5..96e3fd056 100644
--- a/lib/src/screens/dashboard/widgets/wallet_card.dart
+++ b/lib/src/screens/dashboard/widgets/wallet_card.dart
@@ -374,7 +374,6 @@ class WalletCardState extends State<WalletCard> {
                           child: Container(
                             height: 90,
                             child: Column(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: <Widget>[
                                 Text(
@@ -396,18 +395,21 @@ class WalletCardState extends State<WalletCard> {
                                       try {
                                         _addressObserverKey.currentState.setState(() {
                                           messageBoxHeight = 0;
-                                          messageBoxWidth = cardWidth - 10;
+                                          messageBoxWidth = cardWidth;
                                         });
                                       } catch(e) {
                                         print('${e.toString()}');
                                       }
                                     });
                                   },
-                                  child: Text(
-                                    walletStore.subaddress.address,
-                                    style: TextStyle(
-                                        fontSize: 14,
+                                  child: Padding(
+                                    padding: EdgeInsets.only(top: 5),
+                                    child: Text(
+                                      walletStore.subaddress.address,
+                                      style: TextStyle(
+                                        fontSize: 12,
                                         color: Theme.of(context).primaryTextTheme.title.color
+                                      ),
                                     ),
                                   ),
                                 )
diff --git a/lib/src/screens/seed_language/seed_language_page.dart b/lib/src/screens/seed_language/seed_language_page.dart
index c17109b96..68079552f 100644
--- a/lib/src/screens/seed_language/seed_language_page.dart
+++ b/lib/src/screens/seed_language/seed_language_page.dart
@@ -5,10 +5,11 @@ import 'package:flutter/cupertino.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart';
 import 'package:cake_wallet/src/screens/new_wallet/widgets/select_button.dart';
 import 'package:cake_wallet/src/screens/seed_language/widgets/seed_language_picker.dart';
+import 'package:cake_wallet/themes.dart';
+import 'package:cake_wallet/theme_changer.dart';
 
 class SeedLanguage extends BasePage {
   @override
@@ -22,11 +23,15 @@ class SeedLanguageForm extends StatefulWidget {
 
 class SeedLanguageFormState extends State<SeedLanguageForm> {
   static const aspectRatioImage = 1.22;
-  final walletNameImage = Image.asset('assets/images/wallet_name.png');
+  final walletNameImageLight = Image.asset('assets/images/wallet_name_light.png');
+  final walletNameImageDark = Image.asset('assets/images/wallet_name.png');
 
   @override
   Widget build(BuildContext context) {
     final seedLanguageStore = Provider.of<SeedLanguageStore>(context);
+    final _themeChanger = Provider.of<ThemeChanger>(context);
+    final walletNameImage = _themeChanger.getTheme() == Themes.darkTheme
+        ? walletNameImageDark : walletNameImageLight;
 
     final List<String> seedLocales = [
       S.current.seed_language_english,
@@ -40,55 +45,65 @@ class SeedLanguageFormState extends State<SeedLanguageForm> {
     ];
 
     return Container(
-      padding: EdgeInsets.only(top: 24),
-      child: ScrollableWithBottomSection(
-          contentPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-          content: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                Padding(
-                  padding: EdgeInsets.only(left: 12, right: 12),
-                  child: AspectRatio(
-                      aspectRatio: aspectRatioImage,
-                      child: FittedBox(child: walletNameImage, fit: BoxFit.fill)),
-                ),
-                Padding(padding: EdgeInsets.only(top: 40),
-                  child: Text(
-                    S.of(context).seed_language_choose,
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                        fontSize: 16.0,
-                        fontWeight: FontWeight.w600,
-                        color: Theme.of(context).primaryTextTheme.title.color
+      padding: EdgeInsets.all(24),
+      child: Column(
+        children: <Widget>[
+          Flexible(
+            flex: 2,
+            child: AspectRatio(
+              aspectRatio: aspectRatioImage,
+              child: FittedBox(child: walletNameImage, fit: BoxFit.fill)
+            )
+          ),
+          Flexible(
+            flex: 3,
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[
+                Column(
+                  children: <Widget>[
+                    Padding(padding: EdgeInsets.only(top: 48),
+                      child: Text(
+                        S.of(context).seed_language_choose,
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                            fontSize: 16.0,
+                            fontWeight: FontWeight.w600,
+                            color: Theme.of(context).primaryTextTheme.title.color
+                        ),
+                      ),
                     ),
-                  ),
-                ),
-                Padding(padding: EdgeInsets.only(top: 24),
-                  child: Observer(
-                      builder: (_) => SelectButton(
-                          image: null,
-                          text: seedLocales[seedLanguages.indexOf(seedLanguageStore.selectedSeedLanguage)],
-                          color: Theme.of(context).accentTextTheme.title.backgroundColor,
-                          textColor: Theme.of(context).primaryTextTheme.title.color,
-                          onTap: () async => await showDialog(
-                              context: context,
-                              builder: (BuildContext context) => SeedLanguagePicker()
+                    Padding(padding: EdgeInsets.only(top: 24),
+                      child: Observer(
+                          builder: (_) => SelectButton(
+                              image: null,
+                              text: seedLocales[seedLanguages.indexOf(seedLanguageStore.selectedSeedLanguage)],
+                              color: Theme.of(context).accentTextTheme.title.backgroundColor,
+                              textColor: Theme.of(context).primaryTextTheme.title.color,
+                              onTap: () async => await showDialog(
+                                  context: context,
+                                  builder: (BuildContext context) => SeedLanguagePicker()
+                              )
                           )
-                      )
-                  ),
+                      ),
+                    )
+                  ],
+                ),
+                Observer(
+                  builder: (context) {
+                    return PrimaryButton(
+                        onPressed: () =>
+                            Navigator.of(context).popAndPushNamed(seedLanguageStore.currentRoute),
+                        text: S.of(context).seed_language_next,
+                        color: Colors.green,
+                        textColor: Colors.white);
+                  },
                 )
-              ]),
-          bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-          bottomSection: Observer(
-            builder: (context) {
-              return PrimaryButton(
-                  onPressed: () =>
-                      Navigator.of(context).popAndPushNamed(seedLanguageStore.currentRoute),
-                  text: S.of(context).seed_language_next,
-                  color: Colors.green,
-                  textColor: Colors.white);
-            },
-          )),
+              ],
+            )
+          )
+        ],
+      )
     );
   }
 }