icons changed

app/src/main/res/layout/activity_login.xml

@@ -25,10 +25,11 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@+id/loginLayout">
+            android:layout_above="@+id/loginLayout"
+            android:layout_alignParentTop="true">
 
             <ImageView
-                android:layout_width="180dp"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:adjustViewBounds="true"
                 android:scaleType="fitXY"
@@ -43,7 +44,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_centerInParent="true">
+            android:layout_centerInParent="true"
+            android:layout_above="@+id/loginBottomLayout">
 
             <ch.pizzalink.android.view.PizzalinkEditText
                 android:id="@+id/emailPizzalinkEditText"
@@ -72,12 +74,22 @@
                 android:text="@string/button_login"
                 style="@style/PizzalinkButton" />
 
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/loginBottomLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_alignParentBottom="true">
+
             <TextView
                 android:id="@+id/forgotPasswordTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/register_text"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal"
                 android:textColor="@color/black"
                 android:padding="24dp" />
 
@@ -87,6 +99,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/register_text"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal"
                 android:textColor="@color/black"
                 android:paddingBottom="24dp"
                 android:paddingLeft="24dp"
@@ -94,6 +107,7 @@
                 android:paddingRight="24dp"
                 android:paddingEnd="24dp" />
 
+
         </LinearLayout>
 
     </RelativeLayout>

app/src/main/res/layout/activity_splash.xml

@@ -15,7 +15,7 @@
         android:scaleType="fitXY"
         android:layout_centerInParent="true"
         android:text="Hello World!"
-        android:layout_margin="24dp"
+        android:layout_margin="64dp"
         android:src="@drawable/pizzalink_logo"/>
 
 </RelativeLayout>

app/src/main/res/layout/activity_welcome.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="ch.pizzalink.android.activity.WelcomeActivity">
-
-</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/layout_pizzalink_toolbar.xml

@@ -54,6 +54,15 @@
                 fontPath="fonts/AvenirNextLTProDemi.otf"
                 android:visibility="gone"/>
 
+            <ImageView
+                android:layout_width="?attr/actionBarSize"
+                android:layout_height="?attr/actionBarSize"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:padding="12dp"
+                android:layout_centerVertical="true"
+                android:src="@drawable/pizzalink_logo" />
+
         </RelativeLayout>
 
         <RelativeLayout