diff --git a/src/org/lineageos/setupwizard/NavigationLayout.java b/src/org/lineageos/setupwizard/NavigationLayout.java
index daa837f6..bf08b9c4 100644
--- a/src/org/lineageos/setupwizard/NavigationLayout.java
+++ b/src/org/lineageos/setupwizard/NavigationLayout.java
@@ -23,6 +23,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.RelativeLayout;
 
+import com.google.android.setupcompat.template.FooterButtonStyleUtils;
+
 public class NavigationLayout extends RelativeLayout {
     /*
      * An interface to listen to events of the navigation bar,
@@ -42,6 +44,8 @@ public class NavigationLayout extends RelativeLayout {
         View.inflate(context, R.layout.navigation_layout, this);
         mNextButton = findViewById(R.id.navbar_next);
         mSkipButton = findViewById(R.id.navbar_skip);
+        FooterButtonStyleUtils.applyPrimaryButtonPartnerResource(context, mNextButton, true);
+        FooterButtonStyleUtils.applySecondaryButtonPartnerResource(context, mSkipButton, true);
 
         TypedArray a = context.getTheme().obtainStyledAttributes(
              attrs, R.styleable.NavigationLayout, 0, 0);
diff --git a/src/org/lineageos/setupwizard/WelcomeActivity.java b/src/org/lineageos/setupwizard/WelcomeActivity.java
index 6d3311e0..ce0de398 100644
--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -20,7 +20,9 @@ package org.lineageos.setupwizard;
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.Button;
 
+import com.google.android.setupcompat.template.FooterButtonStyleUtils;
 import com.google.android.setupcompat.util.SystemBarHelper;
 
 public class WelcomeActivity extends BaseSetupWizardActivity {
@@ -36,11 +38,15 @@ public class WelcomeActivity extends BaseSetupWizardActivity {
         mRootView = findViewById(R.id.setup_wizard_layout);
         setNextText(R.string.start);
         setSkipText(R.string.emergency_call);
-        findViewById(R.id.start).setOnClickListener(view -> onNextPressed());
-        findViewById(R.id.emerg_dialer)
-                .setOnClickListener(view -> startEmergencyDialer());
+        Button startButton = findViewById(R.id.start);
+        Button emergButton = findViewById(R.id.emerg_dialer);
+        startButton.setOnClickListener(view -> onNextPressed());
+        emergButton.setOnClickListener(view -> startEmergencyDialer());
         findViewById(R.id.launch_accessibility)
                 .setOnClickListener(view -> startAccessibilitySettings());
+
+        FooterButtonStyleUtils.applyPrimaryButtonPartnerResource(this, startButton, true);
+        FooterButtonStyleUtils.applySecondaryButtonPartnerResource(this, emergButton, true);
     }
 
     @Override