diff --git a/res/layout/finish_activity.xml b/res/layout/finish_activity.xml
index 2fc972dc..2d3a5300 100644
--- a/res/layout/finish_activity.xml
+++ b/res/layout/finish_activity.xml
@@ -32,23 +32,17 @@
         android:orientation="vertical"
         android:background="@color/primary">
 
-        <Space android:layout_width="match_parent"
-               android:layout_height="0px"
-               android:layout_weight="1"/>
-
         <ImageView
             android:id="@+id/brand_logo"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0px"
+            android:layout_weight="1"
             android:src="@drawable/logo"
             android:adjustViewBounds="true"
             android:scaleType="fitCenter"
+            android:gravity="center"
             android:padding="@dimen/content_margin_left"/>
 
-        <Space android:layout_width="match_parent"
-               android:layout_height="0px"
-               android:layout_weight="1"/>
-
 
         <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
                   android:id="@+id/navigation_bar"
diff --git a/res/layout/logo_welcome.xml b/res/layout/logo_welcome.xml
deleted file mode 100644
index d3bc6cad..00000000
--- a/res/layout/logo_welcome.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-
-     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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/primary">
-
-    <ImageView
-        android:id="@+id/brand_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/logo"
-        android:paddingLeft="@dimen/header_logo_margin_left"
-        android:paddingBottom="@dimen/header_logo_margin_bottom"/>
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/welcome_activity.xml b/res/layout/welcome_activity.xml
index ff073a50..84950237 100644
--- a/res/layout/welcome_activity.xml
+++ b/res/layout/welcome_activity.xml
@@ -24,23 +24,17 @@
     android:orientation="vertical"
     android:background="@color/primary">
 
-    <Space android:layout_width="match_parent"
-           android:layout_height="0px"
-           android:layout_weight="1"/>
-
     <ImageView
         android:id="@+id/brand_logo"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0px"
+        android:layout_weight="1"
         android:src="@drawable/logo"
         android:adjustViewBounds="true"
         android:scaleType="fitCenter"
+        android:gravity="center"
         android:padding="@dimen/content_margin_left"/>
 
-    <Space android:layout_width="match_parent"
-           android:layout_height="0px"
-           android:layout_weight="1"/>
-
 
     <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
         android:id="@+id/navigation_bar"