diff --git a/Android.bp b/Android.bp
index 9ab0c299b3e7fc680fb8d6c9d9b07b03bf639580..0d9a68b7c6095f54a59e111811a16b6af3de7da7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,6 +27,7 @@ android_app {
         "SystemUISharedLib",
         "org.lineageos.platform.internal",
         "androidx.browser_browser",
+        "elib",
     ],
 
     libs: ["telephony-common"],
diff --git a/res/drawable/logo.xml b/res/drawable/logo.xml
index 942971bd0bc7ffda5d3ca0eb0fb2dab262995451..baf2fc7407e81412f7a1fdb90d4941054dc63906 100644
--- a/res/drawable/logo.xml
+++ b/res/drawable/logo.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="1024.0"
     android:viewportHeight="1024.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/e_alpha_base"
         android:pathData="M511.9,578.8c-65.6,0 -119,-53.4 -119,-119c0,-65.6 53.4,-119 119,-119s119,53.4 119,119c0,12.4 -10.1,22.5 -22.5,22.5h-96.5c-12.4,0 -22.5,-10.1 -22.5,-22.5c0,-12.4 10.1,-22.5 22.5,-22.5h70.5c-9.5,-29.8 -37.6,-51.5 -70.5,-51.5c-40.8,0 -74,33.2 -74,74c0,40.8 33.2,74 74,74c12.4,0 22.5,10.1 22.5,22.5C534.4,568.7 524.3,578.8 511.9,578.8z" />
 </vector>
diff --git a/res/drawable/welcome_logo.xml b/res/drawable/welcome_logo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a40ce6c7dbc6cca9e67d2d78f10b1e405b9bca9e
--- /dev/null
+++ b/res/drawable/welcome_logo.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2018-2022 E FOUNDATION
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
+  <path
+      android:pathData="M28.098,55.958C12.721,55.958 0.211,43.448 0.211,28.07C0.211,12.693 12.721,0.183 28.098,0.183C43.476,0.183 55.986,12.693 55.986,28.07C55.986,30.983 53.626,33.342 50.714,33.342H28.098C25.186,33.342 22.826,30.983 22.826,28.07C22.826,25.158 25.186,22.798 28.098,22.798H44.624C42.387,15.804 35.826,10.727 28.098,10.727C18.536,10.727 10.755,18.508 10.755,28.07C10.755,37.635 18.536,45.414 28.098,45.414C31.011,45.414 33.37,47.773 33.37,50.686C33.37,53.598 31.011,55.958 28.098,55.958Z"
+      android:fillColor="@color/e_alpha_base"/>
+</vector>
diff --git a/res/layout/setup_e_account_manager.xml b/res/layout/setup_e_account_manager.xml
index e9abf98c4b895aceb6713a9721891cb1c9c01904..ec74a7d3b20a3db4f8de32055b247acbf5d7bdbb 100644
--- a/res/layout/setup_e_account_manager.xml
+++ b/res/layout/setup_e_account_manager.xml
@@ -44,7 +44,8 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/SudItemTitle.GlifDescription"
+                        android:textSize="16sp"
+                        android:textColor="?android:attr/textColorPrimary"
                         android:text="@string/e_account_manager_setup_summary" />
 
                     <Button
diff --git a/res/layout/welcome_activity.xml b/res/layout/welcome_activity.xml
index 402d84229ae91f88fe4ee78c032d18750f4b9714..8070d54d435d0130bb87303e00ffddbeb5011374 100644
--- a/res/layout/welcome_activity.xml
+++ b/res/layout/welcome_activity.xml
@@ -10,42 +10,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:gravity="center_vertical">
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2" />
-
-            <ImageView
-                android:id="@+id/brand_logo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/logo" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="0.5" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:orientation="vertical">
+        android:layout_height="match_parent" >
 
             <LinearLayout
                 style="@style/SudContentFrame"
@@ -57,6 +24,15 @@
                 android:paddingEnd="@dimen/welcome_content_container_padding_end"
                 android:paddingBottom="@dimen/welcome_content_container_padding_bottom">
 
+                <ImageView
+                android:id="@+id/brand_logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:scaleType="centerCrop"
+                android:src="@drawable/welcome_logo"
+                android:adjustViewBounds="true"
+                android:layout_marginBottom="32dp" />
+
                 <TextView
                     style="@style/WelcomeTitle"
                     android:id="@+id/welcome_title"
@@ -78,6 +54,7 @@
                         style="@style/SudGlifButton.Secondary"
                         android:layout_width="fill_parent"
                         android:layout_height="fill_parent"
+                        android:layout_marginTop="50dp"
                         android:layout_gravity="center_vertical"
                         android:drawableStart="@drawable/ic_eye"
                         android:gravity="start|center"
@@ -88,13 +65,13 @@
                 </LinearLayout>
             </LinearLayout>
 
-        </LinearLayout>
 
         <LinearLayout
             style="@style/SudGlifButtonBar.Stackable"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom">
+            android:layout_gravity="bottom"
+            android:layout_alignParentBottom="true">
 
             <Button
                 android:id="@+id/emerg_dialer"
@@ -107,7 +84,6 @@
                 android:layout_width="0.0dip"
                 android:layout_height="0.0dip"
                 android:layout_weight="1.0" />
-
             <Button
                 android:id="@id/start"
                 style="@style/SudGlifButton.Primary"
@@ -115,5 +91,5 @@
                 android:layout_height="wrap_content"
                 android:text="@string/start" />
         </LinearLayout>
-    </LinearLayout>
-</com.google.android.setupdesign.GlifLayout>
+    </RelativeLayout>
+</com.google.android.setupdesign.GlifLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 06e36d4ccc8405d512b7793ae05785a08d3532b4..de2d7820c7e42652c8c48d4fa76b85553b82c5ce 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,8 +16,8 @@
     <dimen name="welcome_content_container_padding_bottom">30dp</dimen>
     <dimen name="welcome_content_container_padding_end">24dp</dimen>
     <dimen name="welcome_content_container_padding_start">40dp</dimen>
-    <dimen name="welcome_title_text_size">56sp</dimen>
+    <dimen name="welcome_title_text_size">36sp</dimen>
     <dimen name="welcome_title_padding_bottom">16dp</dimen>
-    <dimen name="welcome_title_line_height">64dp</dimen>
+    <dimen name="welcome_title_line_height">42dp</dimen>
     <dimen name="welcome_accessibility_text_size">20sp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dbbb76db70ca8812bd694a6ab6901a34f6b7a2c3..3bc93c5c405841e50872f25dff92f80a7a712f9c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -8,6 +8,14 @@
     <style name="Theme.Setup" parent="@style/SudFullDynamicColorThemeGlifV3.DayNight">
         <item name="sucUsePartnerResource">true</item>
         <item name="sudUsePartnerHeavyTheme">true</item>
+        <item name="android:colorAccent">@color/e_accent</item>
+        <item name="android:colorBackground">@color/e_background</item>
+        <item name="android:windowBackground">@color/e_background</item>
+        <item name="sucSystemNavBarBackgroundColor">@color/e_background</item>
+        <item name="android:navigationBarColor">@color/e_background</item>
+        <item name="sudScrollIndicators">none</item>
+        <item name="android:navigationBarDividerColor">@android:color/transparent</item>
+        <item name="sucSystemNavBarDividerColor">@android:color/transparent</item>
     </style>
 
     <style name="SpinnerItem">
diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
index e6d6685c0a1b9587dd733523dbd463fc2bcb0960..4e61aa6cd697b999fea9637d80d8142244aa9385 100644
--- a/src/org/lineageos/setupwizard/EAccountManagerActivity.java
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -26,6 +26,8 @@ import android.content.Intent;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
+import android.os.Bundle;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import org.lineageos.setupwizard.util.SetupWizardUtils;
 
@@ -33,6 +35,15 @@ public class EAccountManagerActivity extends SubBaseActivity {
 
     public static final String TAG = EAccountManagerActivity.class.getSimpleName();
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (LOGV) {
+            logActivityState("onCreate savedInstanceState=" + savedInstanceState);
+        }
+        setNextText(R.string.skip);
+    }
+
     @Override
     protected void onStartSubactivity() {
         setNextAllowed(true);