diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 31b4e9f7c..31c2c1414 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -105,6 +105,7 @@
             xmlns:tools="http://schemas.android.com/tools"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:context="fr.gouv.etalab.mastodon.activities.MainActivity"
             >
         </RelativeLayout>
diff --git a/app/src/main/res/layout/edit_profile_action_bar.xml b/app/src/main/res/layout/edit_profile_action_bar.xml
deleted file mode 100644
index 2ac6a39d3..000000000
--- a/app/src/main/res/layout/edit_profile_action_bar.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2017 Thomas Schneider
-
-    This file is a part of Mastalab
-
-    This program is free software; you can redistribute it and/or modify it under the terms of the
-    GNU General Public License as published by the Free Software Foundation; either version 3 of the
-    License, or (at your option) any later version.
-
-    Mastalab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-    Public License for more details.
-
-    You should have received a copy of the GNU General Public License along with Mastalab; if not,
-    see <http://www.gnu.org/licenses>.
--->
-<android.support.v7.widget.Toolbar 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:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary"
-    app:popupTheme="?attr/popupOverlay">
-    <ImageView
-        android:id="@+id/close_conversation"
-        android:src="@drawable/ic_close"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:gravity="center_vertical"
-        android:layout_marginEnd="10dp"
-        android:layout_marginRight="10dp"
-        tools:ignore="ContentDescription" />
-    <ImageView
-        android:id="@+id/pp_actionBar"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical"
-        android:layout_marginEnd="10dp"
-        android:layout_marginRight="10dp"
-        tools:ignore="ContentDescription" />
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:textColor="?attr/actionBarTextColor"
-        android:textSize="14sp"
-        android:id="@+id/toolbar_title" />
-
-</android.support.v7.widget.Toolbar>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tablayout_settings.xml b/app/src/main/res/layout/tablayout_settings.xml
index d62c9972f..21bed1f79 100644
--- a/app/src/main/res/layout/tablayout_settings.xml
+++ b/app/src/main/res/layout/tablayout_settings.xml
@@ -34,6 +34,7 @@
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginBottom="70dp"
         />
 
 </android.support.design.widget.AppBarLayout>
\ No newline at end of file