diff --git a/app/screens/navigation.ts b/app/screens/navigation.ts
index b98575420..22484381c 100644
--- a/app/screens/navigation.ts
+++ b/app/screens/navigation.ts
@@ -148,7 +148,7 @@ Appearance.addChangeListener(() => {
     const theme = getThemeFromState();
     const screens = NavigationStore.getAllNavigationComponents();
 
-    if (screens.includes(Screens.SERVER)) {
+    if (screens.includes(Screens.SERVER) || screens.includes(Screens.ONBOARDING)) {
         for (const screen of screens) {
             if (appearanceControlledScreens.has(screen)) {
                 Navigation.updateProps(screen, {theme});
diff --git a/app/screens/onboarding/footer_buttons.tsx b/app/screens/onboarding/footer_buttons.tsx
index 1c89ee5bf..01390fee4 100644
--- a/app/screens/onboarding/footer_buttons.tsx
+++ b/app/screens/onboarding/footer_buttons.tsx
@@ -26,7 +26,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
         color: theme.buttonColor,
         fontSize: 12,
         marginLeft: 5,
-        marginTop: 2,
+        marginTop: 4.5,
     },
     nextButtonText: {
         flexDirection: 'row',
diff --git a/app/screens/onboarding/illustrations/calls.tsx b/app/screens/onboarding/illustrations/calls.tsx
index 1e0cfe727..183a9ffc7 100644
--- a/app/screens/onboarding/illustrations/calls.tsx
+++ b/app/screens/onboarding/illustrations/calls.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import * as React from 'react';
+import React from 'react';
 import {StyleProp, ViewStyle} from 'react-native';
 import Svg, {
     Ellipse,
diff --git a/app/screens/onboarding/illustrations/integrations.tsx b/app/screens/onboarding/illustrations/integrations.tsx
index bbae61885..17fad9ac7 100644
--- a/app/screens/onboarding/illustrations/integrations.tsx
+++ b/app/screens/onboarding/illustrations/integrations.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import * as React from 'react';
+import React from 'react';
 import {StyleProp, ViewStyle} from 'react-native';
 import Svg, {
     Rect,
diff --git a/app/screens/onboarding/illustrations/team_communication.tsx b/app/screens/onboarding/illustrations/team_communication.tsx
index b1439dbcb..d5ec426c7 100644
--- a/app/screens/onboarding/illustrations/team_communication.tsx
+++ b/app/screens/onboarding/illustrations/team_communication.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import * as React from 'react';
+import React from 'react';
 import {StyleProp, ViewStyle} from 'react-native';
 import Svg, {
     Ellipse,
diff --git a/app/utils/navigation/index.ts b/app/utils/navigation/index.ts
index c4f128310..0f7a0737c 100644
--- a/app/utils/navigation/index.ts
+++ b/app/utils/navigation/index.ts
@@ -7,7 +7,7 @@ import {Navigation, Options} from 'react-native-navigation';
 
 import {Screens} from '@constants';
 
-export const appearanceControlledScreens = new Set([Screens.SERVER, Screens.LOGIN, Screens.FORGOT_PASSWORD, Screens.MFA, Screens.SSO]);
+export const appearanceControlledScreens = new Set([Screens.ONBOARDING, Screens.SERVER, Screens.LOGIN, Screens.FORGOT_PASSWORD, Screens.MFA, Screens.SSO]);
 
 export function mergeNavigationOptions(componentId: string, options: Options) {
     Navigation.mergeOptions(componentId, options);