diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
index ecf3cedb1..70bf281dc 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
@@ -14,6 +14,7 @@ import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -273,7 +274,12 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
     }
 
     private void setOnClickListeners(final Media media) {
-        license.setOnClickListener(v -> openWebBrowser(licenseLink(media)));
+        if (licenseLink(media) != null) {
+            license.setOnClickListener(v -> openWebBrowser(licenseLink(media)));
+            } else {
+            Toast toast = Toast.makeText(getContext(), getString(R.string.null_url), Toast.LENGTH_SHORT);
+            toast.show();
+            }
         if (media.getCoordinates() != null) {
             coordinates.setOnClickListener(v -> openMap(media.getCoordinates()));
         }
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
index 4b4ca3007..cdb9e97d3 100644
--- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
@@ -46,8 +47,9 @@ public class NotificationActivity extends NavigationBaseActivity {
     }
 
     private void initListView() {
-        recyclerView = findViewById(R.id.listView);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        DividerItemDecoration itemDecor = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL);
+        recyclerView.addItemDecoration(itemDecor);
         addNotifications();
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 99c9f253b..fa0e43957 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -5,6 +5,7 @@ import android.accounts.AccountManager;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
 import android.support.v4.widget.DrawerLayout;
@@ -119,8 +120,9 @@ public abstract class NavigationBaseActivity extends BaseActivity
                 return true;
             case R.id.action_feedback:
                 drawerLayout.closeDrawer(navigationView);
-                Intent feedbackIntent = new Intent(Intent.ACTION_SEND);
+                Intent feedbackIntent = new Intent(Intent.ACTION_SENDTO);
                 feedbackIntent.setType("message/rfc822");
+                feedbackIntent.setData(Uri.parse("mailto:"));
                 feedbackIntent.putExtra(Intent.EXTRA_EMAIL,
                         new String[]{CommonsApplication.FEEDBACK_EMAIL});
                 feedbackIntent.putExtra(Intent.EXTRA_SUBJECT,
diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
index 9ecaf9855..2914f9530 100644
--- a/app/src/main/res/layout-land/activity_login.xml
+++ b/app/src/main/res/layout-land/activity_login.xml
@@ -13,12 +13,12 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/large_gap"
             android:layout_marginBottom="@dimen/standard_gap"
             android:layout_marginEnd="@dimen/standard_gap"
             android:layout_marginLeft="@dimen/standard_gap"
             android:layout_marginRight="@dimen/standard_gap"
             android:layout_marginStart="@dimen/standard_gap"
+            android:layout_marginTop="@dimen/large_gap"
             app:cardCornerRadius="4dp"
             app:cardElevation="4dp">
 
@@ -40,11 +40,26 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/heading_text_size" />
 
+                <TextView
+                    android:id="@+id/login_credentials"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
+                    android:paddingBottom="@dimen/standard_gap"
+                    android:paddingTop="@dimen/small_gap"
+                    android:textAlignment="center"
+                    android:textColor="@color/secondaryDarkColor"
+                    tools:text="@string/login_credential" />
+
                 <FrameLayout
                     android:id="@+id/error_message_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/title"
+                    android:layout_below="@id/login_credentials"
                     android:visibility="gone"
                     tools:visibility="visible">
 
@@ -56,6 +71,7 @@
                         android:layout_marginLeft="@dimen/standard_gap"
                         android:layout_marginRight="@dimen/standard_gap"
                         android:layout_marginStart="@dimen/standard_gap"
+                        android:gravity="center"
                         android:paddingBottom="@dimen/small_gap"
                         android:paddingTop="@dimen/small_gap"
                         android:textColor="@color/secondaryDarkColor"
@@ -98,7 +114,7 @@
                     android:layout_marginLeft="@dimen/standard_gap"
                     android:layout_marginRight="@dimen/standard_gap"
                     android:layout_marginStart="@dimen/standard_gap"
-                    app:passwordToggleEnabled="false">
+                    app:passwordToggleEnabled="true">
 
                     <android.support.design.widget.TextInputEditText
                         android:id="@+id/loginPassword"
@@ -149,8 +165,8 @@
 
                     <Button
                         android:id="@+id/signupButton"
-                        android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginEnd="@dimen/small_gap"
@@ -160,8 +176,8 @@
 
                     <Button
                         android:id="@+id/loginButton"
-                        android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Colored"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/small_gap"
                         android:layout_marginStart="@dimen/small_gap"
@@ -174,13 +190,13 @@
                 <fr.free.nrw.commons.ui.widget.HtmlTextView
                     android:id="@+id/about_privacy_policy"
                     style="?android:textAppearanceSmall"
-                    android:layout_below="@id/buttonFrame"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_centerHorizontal="true"
                     android:layout_gravity="center_horizontal"
-                    android:text="@string/about_privacy_policy"
-                    android:layout_centerHorizontal="true"/>
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:text="@string/about_privacy_policy" />
 
             </RelativeLayout>
         </android.support.v7.widget.CardView>
@@ -188,19 +204,19 @@
         <android.support.v7.widget.AppCompatImageView
             android:layout_width="64dp"
             android:layout_height="64dp"
-            android:elevation="8dp"
-            tools:ignore="UnusedAttribute"
             android:layout_gravity="center_horizontal"
-            app:srcCompat="@drawable/blue_rinse_circle" />
+            android:elevation="8dp"
+            app:srcCompat="@drawable/blue_rinse_circle"
+            tools:ignore="UnusedAttribute" />
 
         <android.support.v7.widget.AppCompatImageView
             android:layout_width="42dp"
-            tools:ignore="UnusedAttribute"
             android:layout_height="42dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="8dp"
             android:elevation="8dp"
-            app:srcCompat="@drawable/commons_logo_large" />
+            app:srcCompat="@drawable/commons_logo_large"
+            tools:ignore="UnusedAttribute" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout-land/welcome_do_upload.xml b/app/src/main/res/layout-land/welcome_do_upload.xml
index 1f02c3183..d96b00675 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -73,16 +73,91 @@
                 android:gravity="center_horizontal"
                 android:textColor="@android:color/white"/>
 
-        <TextView
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:paddingTop="@dimen/standard_gap"
+                android:textColor="@android:color/white"/>
+
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:maxWidth="240dp"
-                android:text="@string/tutorial_2_subtext"
+                android:text="@string/tutorial_2_subtext_1"
                 android:layout_gravity="center"
                 android:textAlignment="textStart"
                 android:paddingTop="@dimen/standard_gap"
                 android:gravity="start"
                 android:textColor="@android:color/white"
-            />
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_2_subtext_2"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_2_subtext_3"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-land/welcome_dont_upload.xml b/app/src/main/res/layout-land/welcome_dont_upload.xml
index 1d4d0db80..d950ffc1d 100644
--- a/app/src/main/res/layout-land/welcome_dont_upload.xml
+++ b/app/src/main/res/layout-land/welcome_dont_upload.xml
@@ -55,16 +55,90 @@
             android:gravity="center_horizontal"
             android:textColor="@android:color/white"/>
 
-        <TextView
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:paddingTop="@dimen/standard_gap"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_3_subtext_1"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:paddingTop="@dimen/standard_gap"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxWidth="240dp"
-            android:text="@string/tutorial_3_subtext"
             android:layout_gravity="center"
-            android:textAlignment="textStart"
-            android:paddingTop="@dimen/standard_gap"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_3_subtext_2"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_3_subtext_3"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
     </LinearLayout>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout-land/welcome_image_details.xml b/app/src/main/res/layout-land/welcome_image_details.xml
index d112292a1..79f48829b 100644
--- a/app/src/main/res/layout-land/welcome_image_details.xml
+++ b/app/src/main/res/layout-land/welcome_image_details.xml
@@ -38,16 +38,89 @@
             android:gravity="center_horizontal"
             android:textColor="@android:color/white"/>
 
-        <TextView
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxWidth="240dp"
-            android:text="@string/tutorial_4_subtext"
-            android:layout_gravity="center"
-            android:textAlignment="textStart"
-            android:paddingTop="@dimen/standard_gap"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:paddingTop="@dimen/standard_gap"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_4_subtext_1"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:paddingTop="@dimen/standard_gap"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_4_subtext_2"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_4_subtext_3"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
     </LinearLayout>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout-xlarge/activity_login.xml b/app/src/main/res/layout-xlarge/activity_login.xml
index 32cd47451..b078e6fe3 100644
--- a/app/src/main/res/layout-xlarge/activity_login.xml
+++ b/app/src/main/res/layout-xlarge/activity_login.xml
@@ -13,12 +13,12 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/large_gap"
             android:layout_marginBottom="@dimen/standard_gap"
             android:layout_marginEnd="@dimen/standard_gap"
             android:layout_marginLeft="@dimen/standard_gap"
             android:layout_marginRight="@dimen/standard_gap"
             android:layout_marginStart="@dimen/standard_gap"
+            android:layout_marginTop="@dimen/large_gap"
             app:cardCornerRadius="4dp"
             app:cardElevation="4dp">
 
@@ -40,6 +40,21 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/heading_text_size" />
 
+                <TextView
+                    android:id="@+id/login_credentials"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
+                    android:paddingBottom="@dimen/small_gap"
+                    android:paddingTop="@dimen/small_gap"
+                    android:textAlignment="center"
+                    android:textColor="@color/secondaryDarkColor"
+                    tools:text="@string/login_credential" />
+
                 <FrameLayout
                     android:id="@+id/error_message_container"
                     android:layout_width="match_parent"
@@ -56,6 +71,7 @@
                         android:layout_marginLeft="@dimen/standard_gap"
                         android:layout_marginRight="@dimen/standard_gap"
                         android:layout_marginStart="@dimen/standard_gap"
+                        android:gravity="center"
                         android:paddingBottom="@dimen/small_gap"
                         android:paddingTop="@dimen/small_gap"
                         android:textColor="@color/secondaryDarkColor"
@@ -121,7 +137,7 @@
                     android:layout_marginRight="@dimen/standard_gap"
                     android:layout_marginStart="@dimen/standard_gap"
                     android:visibility="gone"
-                    app:passwordToggleEnabled="false"
+                    app:passwordToggleEnabled="true"
                     tools:visibility="visible">
 
                     <android.support.design.widget.TextInputEditText
@@ -149,8 +165,8 @@
 
                     <Button
                         android:id="@+id/signupButton"
-                        android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginEnd="@dimen/small_gap"
@@ -160,8 +176,8 @@
 
                     <Button
                         android:id="@+id/loginButton"
-                        android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Colored"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/small_gap"
                         android:layout_marginStart="@dimen/small_gap"
@@ -174,13 +190,13 @@
                 <fr.free.nrw.commons.ui.widget.HtmlTextView
                     android:id="@+id/about_privacy_policy"
                     style="?android:textAppearanceSmall"
-                    android:layout_below="@id/buttonFrame"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_centerHorizontal="true"
                     android:layout_gravity="center_horizontal"
-                    android:text="@string/about_privacy_policy"
-                    android:layout_centerHorizontal="true"/>
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:text="@string/about_privacy_policy" />
 
             </RelativeLayout>
         </android.support.v7.widget.CardView>
@@ -188,8 +204,8 @@
         <android.support.v7.widget.AppCompatImageView
             android:layout_width="64dp"
             android:layout_height="64dp"
-            android:elevation="8dp"
             android:layout_gravity="center_horizontal"
+            android:elevation="8dp"
             app:srcCompat="@drawable/blue_rinse_circle"
             tools:ignore="UnusedAttribute" />
 
@@ -198,9 +214,9 @@
             android:layout_height="42dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="8dp"
-            tools:ignore="UnusedAttribute"
             android:elevation="8dp"
-            app:srcCompat="@drawable/commons_logo_large" />
+            app:srcCompat="@drawable/commons_logo_large"
+            tools:ignore="UnusedAttribute" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 82aa38919..f03ff9c76 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -5,137 +5,135 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
-        <include
-            android:id="@+id/toolbar"
-            layout="@layout/toolbar"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/toolbar"
-            android:layout_marginLeft="@dimen/activity_margin_horizontal"
-            android:layout_marginStart="@dimen/activity_margin_horizontal"
-            android:layout_marginRight="@dimen/activity_margin_horizontal"
-            android:layout_marginEnd="@dimen/activity_margin_horizontal"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_launcher"
-                android:contentDescription= "@string/commons_logo"
-                />
-
-            <TextView
-                style="?android:textAppearanceLarge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name" />
-
-            <TextView
-                android:id="@+id/about_version"
-                android:layout_width="wrap_content"
+            <include
+                android:id="@+id/toolbar"
+                layout="@layout/toolbar"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <fr.free.nrw.commons.ui.widget.HtmlTextView
-                android:id="@+id/about_license"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_gap"
-                android:gravity="center"
-                android:text="@string/about_license" />
-
-            <fr.free.nrw.commons.ui.widget.HtmlTextView
-                android:id="@+id/about_improve"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/small_gap"
-                android:gravity="center"
-                android:text="@string/about_improve" />
-
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                android:layout_marginStart="@dimen/activity_margin_horizontal"
-                android:layout_marginRight="@dimen/activity_margin_horizontal"
-                android:layout_marginTop="@dimen/activity_margin_horizontal"
+                android:layout_height="match_parent"
+                android:layout_below="@id/toolbar"
                 android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                >
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                android:layout_marginStart="@dimen/activity_margin_horizontal"
+                android:layout_marginTop="@dimen/activity_margin_vertical"
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <ImageView
-                    android:id="@+id/website_launch_icon"
-                    android:layout_width="@dimen/overflow_icon_dimen"
-                    android:layout_height="@dimen/overflow_icon_dimen"
-                    app:srcCompat="@drawable/ic_action_website"
-                    android:contentDescription= "@string/commons_website"
-                    android:layout_margin="@dimen/activity_margin_horizontal"
-                    />
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/commons_logo"
+                    android:src="@drawable/ic_launcher" />
 
-                <ImageView
-                    android:id="@+id/facebook_launch_icon"
-                    android:layout_width="@dimen/overflow_icon_dimen"
-                    android:layout_height="@dimen/overflow_icon_dimen"
-                    app:srcCompat="@drawable/ic_action_facebook"
-                    android:contentDescription= "@string/commons_facebook"
-                    android:layout_margin="@dimen/activity_margin_horizontal"
-                    />
+                <TextView
+                    style="?android:textAppearanceLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name" />
 
-                <ImageView
-                    android:id="@+id/github_launch_icon"
-                    android:layout_width="@dimen/overflow_icon_dimen"
-                    android:layout_height="@dimen/overflow_icon_dimen"
-                    app:srcCompat="@drawable/ic_action_github"
-                    android:contentDescription= "@string/commons_github"
-                    android:layout_margin="@dimen/activity_margin_horizontal"
-                    />
+                <TextView
+                    android:id="@+id/about_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_license"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/standard_gap"
+                    android:gravity="center"
+                    android:text="@string/about_license" />
+
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_improve"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/small_gap"
+                    android:gravity="center"
+                    android:text="@string/about_improve" />
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                    android:layout_marginRight="@dimen/activity_margin_horizontal"
+                    android:layout_marginStart="@dimen/activity_margin_horizontal"
+                    android:layout_marginTop="@dimen/activity_margin_horizontal"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/website_launch_icon"
+                        android:layout_width="@dimen/overflow_icon_dimen"
+                        android:layout_height="@dimen/overflow_icon_dimen"
+                        android:layout_margin="@dimen/activity_margin_horizontal"
+                        android:contentDescription="@string/commons_website"
+                        app:srcCompat="@drawable/ic_action_website" />
+
+                    <ImageView
+                        android:id="@+id/facebook_launch_icon"
+                        android:layout_width="@dimen/overflow_icon_dimen"
+                        android:layout_height="@dimen/overflow_icon_dimen"
+                        android:layout_margin="@dimen/activity_margin_horizontal"
+                        android:contentDescription="@string/commons_facebook"
+                        app:srcCompat="@drawable/ic_action_facebook" />
+
+                    <ImageView
+                        android:id="@+id/github_launch_icon"
+                        android:layout_width="@dimen/overflow_icon_dimen"
+                        android:layout_height="@dimen/overflow_icon_dimen"
+                        android:layout_margin="@dimen/activity_margin_horizontal"
+                        android:contentDescription="@string/commons_github"
+                        app:srcCompat="@drawable/ic_action_github" />
+
+                </LinearLayout>
+
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_privacy_policy"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/standard_gap"
+                    android:gravity="center"
+                    android:text="@string/about_privacy_policy" />
+
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_credits"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/standard_gap"
+                    android:gravity="center"
+                    android:text="@string/about_credits" />
+
+                <TextView
+                    android:id="@+id/about_uploads_to"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/large_gap"
+                    android:alpha="0.2"
+                    android:gravity="center" />
 
             </LinearLayout>
-
-            <TextView
-                android:id="@+id/about_privacy_policy"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_gap"
-                android:gravity="center"
-                android:textColor="@color/primaryColor"
-                android:text="@string/about_privacy_policy" />
-
-            <TextView
-                android:id="@+id/about_credits"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_gap"
-                android:gravity="center"
-                android:textColor="@color/primaryColor"
-                android:text="@string/about_credits"
-                />
-
-            <TextView
-                android:id="@+id/about_uploads_to"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/large_gap"
-                android:alpha="0.2"
-                android:gravity="center" />
-
-        </LinearLayout>
-    </RelativeLayout>
+        </RelativeLayout>
+    </ScrollView>
 
     <android.support.design.widget.NavigationView
         android:id="@+id/navigation_view"
@@ -143,6 +141,6 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         app:headerLayout="@layout/drawer_header"
-        app:menu="@menu/drawer"/>
+        app:menu="@menu/drawer" />
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 1681d89f7..b816a37fb 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -44,20 +44,20 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/heading_text_size" />
 
-                    <TextView
-                        android:id="@+id/login_credentials"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/title"
-                        android:layout_marginEnd="@dimen/standard_gap"
-                        android:layout_marginLeft="@dimen/standard_gap"
-                        android:layout_marginRight="@dimen/standard_gap"
-                        android:layout_marginStart="@dimen/standard_gap"
-                        android:paddingBottom="@dimen/small_gap"
-                        android:paddingTop="@dimen/small_gap"
-                        android:textAlignment="center"
-                        android:textColor="@color/secondaryDarkColor"
-                        tools:text="@string/login_credential"/>
+                <TextView
+                    android:id="@+id/login_credentials"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
+                    android:paddingBottom="@dimen/small_gap"
+                    android:paddingTop="@dimen/small_gap"
+                    android:textAlignment="center"
+                    android:textColor="@color/secondaryDarkColor"
+                    tools:text="@string/login_credential" />
 
 
                 <FrameLayout
@@ -67,6 +67,7 @@
                     android:layout_below="@id/login_credentials"
                     android:visibility="gone"
                     tools:visibility="visible">
+
                     <TextView
                         android:id="@+id/error_message"
                         android:layout_width="match_parent"
@@ -75,6 +76,7 @@
                         android:layout_marginLeft="@dimen/standard_gap"
                         android:layout_marginRight="@dimen/standard_gap"
                         android:layout_marginStart="@dimen/standard_gap"
+                        android:gravity="center"
                         android:paddingBottom="@dimen/small_gap"
                         android:paddingTop="@dimen/small_gap"
                         android:textColor="@color/secondaryDarkColor"
@@ -117,7 +119,7 @@
                     android:layout_marginLeft="@dimen/standard_gap"
                     android:layout_marginRight="@dimen/standard_gap"
                     android:layout_marginStart="@dimen/standard_gap"
-                    app:passwordToggleEnabled="false">
+                    app:passwordToggleEnabled="true">
 
                     <android.support.design.widget.TextInputEditText
                         android:id="@+id/loginPassword"
diff --git a/app/src/main/res/layout/detail_category_item.xml b/app/src/main/res/layout/detail_category_item.xml
index 51302fd0d..ad6a7fca4 100644
--- a/app/src/main/res/layout/detail_category_item.xml
+++ b/app/src/main/res/layout/detail_category_item.xml
@@ -21,9 +21,4 @@
         app:drawableStart="@drawable/ic_info_outline_white_24dp"
         />
 
-    <fr.free.nrw.commons.media.MediaDetailSpacer
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/small_gap"
-        />
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml
index cffca14c6..5cc303763 100644
--- a/app/src/main/res/layout/fragment_media_detail.xml
+++ b/app/src/main/res/layout/fragment_media_detail.xml
@@ -149,6 +149,10 @@
                         tools:text="License link" />
                 </LinearLayout>
 
+                <fr.free.nrw.commons.media.MediaDetailSpacer
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/small_gap" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/welcome_do_upload.xml b/app/src/main/res/layout/welcome_do_upload.xml
index b2befbf12..fab6452df 100644
--- a/app/src/main/res/layout/welcome_do_upload.xml
+++ b/app/src/main/res/layout/welcome_do_upload.xml
@@ -67,15 +67,95 @@
         android:textColor="@android:color/white"
         />
 
-    <TextView
-        android:layout_width="295dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
-        android:text="@string/tutorial_2_subtext"
-        android:layout_gravity="center"
-        android:textAlignment="textStart"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="start"
-        android:textColor="@android:color/white"
-        />
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bullet"
+            android:paddingRight="4dp"
+            android:textSize="16sp"
+            android:paddingTop="@dimen/standard_gap"
+            android:textColor="@android:color/white"/>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_2_subtext_1"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:paddingTop="@dimen/standard_gap"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bullet"
+            android:paddingRight="4dp"
+            android:textSize="16sp"
+            android:textColor="@android:color/white"/>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_2_subtext_2"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_2_subtext_3"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome_dont_upload.xml b/app/src/main/res/layout/welcome_dont_upload.xml
index 8d352547e..d819bc035 100644
--- a/app/src/main/res/layout/welcome_dont_upload.xml
+++ b/app/src/main/res/layout/welcome_dont_upload.xml
@@ -48,15 +48,87 @@
         android:textColor="@android:color/white"
         />
 
-    <TextView
-        android:layout_width="295dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
-        android:text="@string/tutorial_3_subtext"
-        android:layout_gravity="center"
-        android:textAlignment="textStart"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="start"
-        android:textColor="@android:color/white"
-        />
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bullet"
+            android:paddingRight="4dp"
+            android:textSize="16sp"
+            android:paddingTop="@dimen/standard_gap"
+            android:textColor="@android:color/white"/>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_3_subtext_1"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:paddingTop="@dimen/standard_gap"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bullet"
+            android:paddingRight="4dp"
+            android:textSize="16sp"
+            android:textColor="@android:color/white"/>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_3_subtext_2"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bullet"
+            android:paddingRight="4dp"
+            android:textSize="16sp"
+            android:textColor="@android:color/white"/>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_3_subtext_3"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome_image_details.xml b/app/src/main/res/layout/welcome_image_details.xml
index 0b4618b37..e38eb5979 100644
--- a/app/src/main/res/layout/welcome_image_details.xml
+++ b/app/src/main/res/layout/welcome_image_details.xml
@@ -32,15 +32,101 @@
         android:textColor="@android:color/white"
         />
 
-    <TextView
-        android:layout_width="278dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
-        android:text="@string/tutorial_4_subtext"
-        android:layout_gravity="center"
-        android:textAlignment="textStart"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="start"
-        android:textColor="@android:color/white"
-        />
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bullet"
+            android:paddingRight="4dp"
+            android:textSize="16sp"
+            android:paddingTop="@dimen/standard_gap"
+            android:textColor="@android:color/white"/>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_4_subtext_1"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:paddingTop="@dimen/standard_gap"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_4_subtext_2"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_4_subtext_3"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ddc44287..2ba510572 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Commons</string>
+  <string name="bullet">&#8226;  </string>
   <string name="menu_settings">Settings</string>
   <string name="username">Username</string>
   <string name="password">Password</string>
@@ -120,11 +121,20 @@
   <string name="tutorial_1_text">Wikimedia Commons hosts most of the images that are used in Wikipedia.</string>
   <string name="tutorial_1_subtext">Your images help educate people around the world!</string>
   <string name="tutorial_2_text">Please upload pictures that are taken or created entirely by yourself:</string>
-  <string name="tutorial_2_subtext">- Natural objects (flowers, animals, mountains)\n- Useful objects (bicycles, train stations)\n- Famous people (your mayor, Olympic athletes you met)</string>
+  <string name="tutorial_2_subtext">Natural objects (flowers, animals, mountains)\n&#8226; Useful objects (bicycles, train stations)\n&#8226; Famous people (your mayor, Olympic athletes you met)</string>
+  <string name="tutorial_2_subtext_1">Natural objects (flowers, animals, mountains)</string>
+  <string name="tutorial_2_subtext_2">Useful objects (bicycles, train stations)</string>
+  <string name="tutorial_2_subtext_3">Famous people (your mayor, Olympic athletes you met)</string>
   <string name="tutorial_3_text">Please do NOT upload:</string>
   <string name="tutorial_3_subtext">- Selfies or pictures of your friends\n- Pictures you downloaded from the Internet\n- Screenshots of proprietary apps</string>
+  <string name="tutorial_3_subtext_1">Selfies or pictures of your friends</string>
+  <string name="tutorial_3_subtext_2">Pictures you downloaded from the Internet</string>
+  <string name="tutorial_3_subtext_3">Screenshots of proprietary apps</string>
   <string name="tutorial_4_text">Example upload:</string>
   <string name="tutorial_4_subtext">- Title: Sydney Opera House\n- Description: Sydney Opera House as viewed from across the bay\n- Categories: Sydney Opera House from the west, Sydney Opera House remote views</string>
+  <string name="tutorial_4_subtext_1">Title: Sydney Opera House</string>
+  <string name="tutorial_4_subtext_2">Description: Sydney Opera House as viewed from across the bay</string>
+  <string name="tutorial_4_subtext_3">Categories: Sydney Opera House from the west, Sydney Opera House remote views</string>
   <string name="welcome_wikipedia_text">Contribute your images. Help Wikipedia articles come to life!</string>
   <string name="welcome_wikipedia_subtext">Images on Wikipedia come from Wikimedia Commons.</string>
   <string name="welcome_copyright_text">Your images help educate people around the world.</string>
@@ -214,6 +224,7 @@
   <string name="login_to_your_account">Login to your account</string>
   <string name="send_log_file">Send log file</string>
   <string name="send_log_file_description">Send log file to developers via email</string>
+  <string name="null_url">Error! URL not found</string>
 
   <string name="nearby_location_has_not_changed">Location has not changed.</string>
   <string name="nearby_location_not_available">Location not available.</string>