diff --git a/apps/wallet-mobile/src/Dashboard/EpochProgress.tsx b/apps/wallet-mobile/src/Dashboard/EpochProgress.tsx
index 5087b61185..e453f6f64e 100644
--- a/apps/wallet-mobile/src/Dashboard/EpochProgress.tsx
+++ b/apps/wallet-mobile/src/Dashboard/EpochProgress.tsx
@@ -101,7 +101,6 @@ const useStyles = () => {
     timeBlock: {
       ...typography['body-1-l-regular'],
       ...padding['x-xs'],
-      backgroundColor: color.gray[900],
       color: color.gray[900],
       marginHorizontal: 4,
       borderRadius: 2,
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeWalletName/ChangeWalletName.tsx b/apps/wallet-mobile/src/features/Settings/ChangeWalletName/ChangeWalletName.tsx
index 4a1cb947a3..f44174f561 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeWalletName/ChangeWalletName.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ChangeWalletName/ChangeWalletName.tsx
@@ -5,7 +5,7 @@ import {defineMessages, useIntl} from 'react-intl'
 import {ScrollView, StyleSheet, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Button, KeyboardAvoidingView, TextInput} from '../../../components'
+import {Button, KeyboardAvoidingView, Spacer, TextInput} from '../../../components'
 import globalMessages from '../../../i18n/global-messages'
 import {isEmptyString} from '../../../utils/utils'
 import {useWalletManager} from '../../../wallet-manager/WalletManagerContext'
@@ -39,6 +39,8 @@ export const ChangeWalletName = () => {
   return (
     <SafeAreaView style={styles.safeAreaView} edges={['left', 'right', 'bottom']}>
       <KeyboardAvoidingView style={{flex: 1}}>
+        <Spacer height={40} />
+
         <ScrollView
           keyboardDismissMode="on-drag"
           keyboardShouldPersistTaps="always"
@@ -57,6 +59,8 @@ export const ChangeWalletName = () => {
           />
         </ScrollView>
 
+        <Spacer fill />
+
         <View style={styles.action}>
           <Button
             onPress={() => {
@@ -75,20 +79,16 @@ export const ChangeWalletName = () => {
 
 const useStyles = () => {
   const {theme} = useTheme()
-  const {color} = theme
+  const {padding} = theme
   const styles = StyleSheet.create({
     safeAreaView: {
-      backgroundColor: color.gray.min,
       flex: 1,
     },
     scrollContentContainer: {
-      flex: 1,
-      paddingHorizontal: 16,
-      paddingTop: 40,
+      ...padding['x-l'],
     },
     action: {
-      paddingHorizontal: 16,
-      backgroundColor: color.gray.min,
+      ...padding['l'],
     },
   })
   return styles
diff --git a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx b/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
index bae67b1c16..02adfb7833 100644
--- a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
@@ -36,8 +36,8 @@ export const RemoveWalletScreen = () => {
 
   return (
     <SafeAreaView edges={['left', 'right', 'bottom']} style={styles.container}>
-      <KeyboardAvoidingView style={{flex: 1}}>
-        <ScrollView bounces={false} contentContainerStyle={styles.contentContainer}>
+      <KeyboardAvoidingView style={styles.keyboardAvoider}>
+        <ScrollView contentContainerStyle={styles.contentContainer} bounces={false}>
           <Description>
             {!wallet.isHW && <Text style={styles.description}>{strings.descriptionParagraph1}</Text>}
 
@@ -66,6 +66,8 @@ export const RemoveWalletScreen = () => {
           </WalletInfo>
         </ScrollView>
 
+        <Spacer fill />
+
         <Actions>
           {!wallet.isHW && (
             <Checkbox
@@ -77,15 +79,12 @@ export const RemoveWalletScreen = () => {
 
           <Spacer height={30} />
 
-          <View style={styles.buttonContainer}>
-            <Button
-              onPress={() => removeWallet()}
-              title={strings.remove}
-              style={styles.removeButton}
-              disabled={disabled}
-              block
-            />
-          </View>
+          <Button
+            onPress={() => removeWallet()}
+            title={strings.remove}
+            style={styles.removeButton}
+            disabled={disabled}
+          />
         </Actions>
       </KeyboardAvoidingView>
     </SafeAreaView>
@@ -155,13 +154,15 @@ const useStrings = () => {
 
 const useStyles = () => {
   const {theme} = useTheme()
-  const {color, typography} = theme
+  const {color, typography, padding} = theme
   const styles = StyleSheet.create({
     container: {
       flex: 1,
       backgroundColor: color.gray.min,
     },
-
+    contentContainer: {
+      ...padding['x-l'],
+    },
     descriptionContainer: {
       backgroundColor: color.gray.min,
     },
@@ -175,21 +176,15 @@ const useStyles = () => {
     walletName: {
       ...typography['body-1-l-regular'],
     },
-
-    contentContainer: {
-      padding: 16,
-    },
-
     actions: {
-      padding: 16,
+      ...padding['l'],
+    },
+    keyboardAvoider: {
+      flex: 1,
     },
     removeButton: {
       backgroundColor: color.magenta[500],
     },
-    buttonContainer: {
-      paddingHorizontal: 16,
-      paddingBottom: 36,
-    },
   })
   return styles
 }
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/ChangeWalletName/ChangeWalletName.json b/apps/wallet-mobile/translations/messages/src/features/Settings/ChangeWalletName/ChangeWalletName.json
index 9004170081..394cee694c 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/ChangeWalletName/ChangeWalletName.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/ChangeWalletName/ChangeWalletName.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 100,
       "column": 16,
-      "index": 3378
+      "index": 3320
     },
     "end": {
       "line": 103,
       "column": 3,
-      "index": 3482
+      "index": 3424
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 104,
       "column": 24,
-      "index": 3508
+      "index": 3450
     },
     "end": {
       "line": 107,
       "column": 3,
-      "index": 3620
+      "index": 3562
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
index 214bee0021..1f87fc3a51 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!If you wish to permanently delete the wallet make sure you have written down the mnemonic.",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 111,
+      "line": 106,
       "column": 25,
-      "index": 3540
+      "index": 3392
     },
     "end": {
-      "line": 114,
+      "line": 109,
       "column": 3,
-      "index": 3734
+      "index": 3586
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!To confirm this operation type the wallet name below.",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 115,
+      "line": 110,
       "column": 25,
-      "index": 3761
+      "index": 3613
     },
     "end": {
-      "line": 118,
+      "line": 113,
       "column": 3,
-      "index": 3918
+      "index": 3770
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 119,
+      "line": 114,
       "column": 14,
-      "index": 3934
+      "index": 3786
     },
     "end": {
-      "line": 122,
+      "line": 117,
       "column": 3,
-      "index": 4038
+      "index": 3890
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 123,
+      "line": 118,
       "column": 19,
-      "index": 4059
+      "index": 3911
     },
     "end": {
-      "line": 126,
+      "line": 121,
       "column": 3,
-      "index": 4168
+      "index": 4020
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Wallet name does not match",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 127,
+      "line": 122,
       "column": 27,
-      "index": 4197
+      "index": 4049
     },
     "end": {
-      "line": 130,
+      "line": 125,
       "column": 3,
-      "index": 4329
+      "index": 4181
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Remove wallet",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 131,
+      "line": 126,
       "column": 10,
-      "index": 4341
+      "index": 4193
     },
     "end": {
-      "line": 134,
+      "line": 129,
       "column": 3,
-      "index": 4443
+      "index": 4295
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!I have written down mnemonic of this wallet and understand that I cannot recover the wallet without it.",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 135,
+      "line": 130,
       "column": 26,
-      "index": 4471
+      "index": 4323
     },
     "end": {
-      "line": 139,
+      "line": 134,
       "column": 3,
-      "index": 4685
+      "index": 4537
     }
   }
 ]
\ No newline at end of file