3 files changed, 20 insertions, 3 deletions
diff --git a/src/main/res/animator/fade_in.xml b/src/main/res/animator/fade_in.xml
new file mode 100644
index 000000000..8307c7835
--- /dev/null
+++ b/src/main/res/animator/fade_in.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha xmlns:android="http://schemas.android.com/apk/res/android"
+        android:duration="200"
+        android:fromAlpha="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toAlpha="1.0" />
+</set>
+\ No newline at end of file
diff --git a/src/main/res/animator/fade_out.xml b/src/main/res/animator/fade_out.xml
new file mode 100644
index 000000000..d5912c116
--- /dev/null
+++ b/src/main/res/animator/fade_out.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha xmlns:android="http://schemas.android.com/apk/res/android"
+        android:duration="200"
+        android:fromAlpha="1.0"
+        android:interpolator="@android:anim/anticipate_interpolator"
+        android:toAlpha="0.0" />
+</set>
+\ No newline at end of file
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index d761169d8..dd3afeeac 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -5,13 +5,14 @@
     android:layout_height="match_parent"
     android:background="?attr/color_background_secondary">
 
-    <include layout="@layout/toolbar" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
     <ScrollView
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/button_bar"
-        android:layout_alignParentTop="true"
         android:layout_below="@id/toolbar">
 
         <android.support.v7.widget.CardView