diff --git a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
index 8c8c3636a..74bf0f3d7 100644
--- a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
+++ b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
@@ -125,7 +125,6 @@ public class MainActivity extends AppCompatActivity
     private HashMap<String, String> tagTile = new HashMap<>();
     private HashMap<String, Integer> tagItem = new HashMap<>();
     private TextView toolbarTitle;
-    private ImageView pp_actionBar;
     private SearchView toolbar_search;
     private ImageLoader imageLoader;
     private DisplayImageOptions options;
@@ -223,7 +222,6 @@ public class MainActivity extends AppCompatActivity
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         toolbarTitle  = (TextView) toolbar.findViewById(R.id.toolbar_title);
-        pp_actionBar = (ImageView) toolbar.findViewById(R.id.pp_actionBar);
         toolbar_search = (SearchView) toolbar.findViewById(R.id.toolbar_search);
         tabLayout = (TabLayout) findViewById(R.id.tabLayout);
         TabLayout.Tab tabHome = tabLayout.newTab();
@@ -295,29 +293,9 @@ public class MainActivity extends AppCompatActivity
                 } else {
                     stackBack.push(tab.getPosition());
                 }
-                final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
-                MenuItem item = null;
-                String fragmentTag = null;
                 main_app_container.setVisibility(View.GONE);
                 viewPager.setVisibility(View.VISIBLE);
                 Helper.switchLayout(MainActivity.this);
-                if( tab.getPosition() == 0) {
-                    fragmentTag = "HOME_TIMELINE";
-                }else if( tab.getPosition() == 1) {
-                    fragmentTag = "NOTIFICATIONS";
-                }else if( tab.getPosition() == 2 && display_local) {
-                    fragmentTag = "LOCAL_TIMELINE";
-                }else if( tab.getPosition() == 2 && !display_local) {
-                        fragmentTag = "PUBLIC_TIMELINE";
-                }else if( tab.getPosition() == 3){
-                    fragmentTag = "PUBLIC_TIMELINE";
-                }
-                if( item != null){
-                    toolbarTitle.setText(item.getTitle());
-                    populateTitleWithTag(fragmentTag, item.getTitle().toString(), item.getItemId());
-                    unCheckAllMenuItems(navigationView);
-                    item.setChecked(true);
-                }
                 if( tab.getPosition() != 1 )
                     toot.setVisibility(View.VISIBLE);
                 else
@@ -431,7 +409,7 @@ public class MainActivity extends AppCompatActivity
                 toolbar_search.setQuery("", false);
                 toolbar_search.setIconified(true);
                 toolbarTitle.setVisibility(View.VISIBLE);
-                pp_actionBar.setVisibility(View.VISIBLE);
+                tabLayout.setVisibility(View.VISIBLE);
                 return false;
             }
             @Override
@@ -445,8 +423,17 @@ public class MainActivity extends AppCompatActivity
         toolbar_search.setOnCloseListener(new SearchView.OnCloseListener() {
             @Override
             public boolean onClose() {
-                toolbarTitle.setVisibility(View.VISIBLE);
-                pp_actionBar.setVisibility(View.VISIBLE);
+                if( main_app_container.getVisibility() == View.VISIBLE){
+                    main_app_container.setVisibility(View.VISIBLE);
+                    viewPager.setVisibility(View.GONE);
+                    tabLayout.setVisibility(View.GONE);
+                    toolbarTitle.setVisibility(View.VISIBLE);
+                }else {
+                    main_app_container.setVisibility(View.GONE);
+                    viewPager.setVisibility(View.VISIBLE);
+                    tabLayout.setVisibility(View.VISIBLE);
+                    toolbarTitle.setVisibility(View.GONE);
+                }
                 //your code here
                 return false;
             }
@@ -455,11 +442,20 @@ public class MainActivity extends AppCompatActivity
             @Override
             public void onClick(View v) {
                 if( toolbar_search.isIconified()){
-                    toolbarTitle.setVisibility(View.VISIBLE);
-                    pp_actionBar.setVisibility(View.VISIBLE);
+                    if( main_app_container.getVisibility() == View.VISIBLE){
+                        main_app_container.setVisibility(View.VISIBLE);
+                        viewPager.setVisibility(View.GONE);
+                        tabLayout.setVisibility(View.GONE);
+                        toolbarTitle.setVisibility(View.VISIBLE);
+                    }else {
+                        main_app_container.setVisibility(View.GONE);
+                        viewPager.setVisibility(View.VISIBLE);
+                        tabLayout.setVisibility(View.VISIBLE);
+                        toolbarTitle.setVisibility(View.GONE);
+                    }
                 }else {
                     toolbarTitle.setVisibility(View.GONE);
-                    pp_actionBar.setVisibility(View.GONE);
+                    tabLayout.setVisibility(View.GONE);
                 }
             }
         });
@@ -697,9 +693,11 @@ public class MainActivity extends AppCompatActivity
                     super.onBackPressed();
                 }
             }else {
-                viewPager.setVisibility(View.VISIBLE);
                 Helper.switchLayout(MainActivity.this);
                 main_app_container.setVisibility(View.GONE);
+                viewPager.setVisibility(View.VISIBLE);
+                tabLayout.setVisibility(View.VISIBLE);
+                toolbarTitle.setVisibility(View.GONE);
                 final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
                 unCheckAllMenuItems(navigationView);
                 toot.setVisibility(View.VISIBLE);
@@ -915,8 +913,6 @@ public class MainActivity extends AppCompatActivity
         item.setChecked(true);
         //Remove the search bar
         if( !toolbar_search.isIconified() ) {
-            toolbarTitle.setVisibility(View.VISIBLE);
-            pp_actionBar.setVisibility(View.VISIBLE);
             toolbar_search.setIconified(true);
         }
         toolbarTitle.setText(item.getTitle());
@@ -929,6 +925,7 @@ public class MainActivity extends AppCompatActivity
         main_app_container.setVisibility(View.VISIBLE);
         viewPager.setVisibility(View.GONE);
         tabLayout.setVisibility(View.GONE);
+        toolbarTitle.setVisibility(View.VISIBLE);
         if (id == R.id.nav_settings) {
             toot.setVisibility(View.GONE);
             TabLayoutSettingsFragment tabLayoutSettingsFragment= new TabLayoutSettingsFragment();
@@ -1060,7 +1057,7 @@ public class MainActivity extends AppCompatActivity
             //Remove the search bar
             if( !toolbar_search.isIconified() ) {
                 toolbarTitle.setVisibility(View.VISIBLE);
-                pp_actionBar.setVisibility(View.VISIBLE);
+                tabLayout.setVisibility(View.VISIBLE);
                 toolbar_search.setIconified(true);
             }
             //Selection comes from another menu, no action to do
diff --git a/app/src/main/res/drawable-hdpi/ic_notifications_tl.png b/app/src/main/res/drawable-hdpi/ic_notifications_tl.png
index b1a6e580d..3025a066d 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_notifications_tl.png and b/app/src/main/res/drawable-hdpi/ic_notifications_tl.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_notifications_tl.png b/app/src/main/res/drawable-ldpi/ic_notifications_tl.png
index 3b3d3dc64..ef0fec053 100644
Binary files a/app/src/main/res/drawable-ldpi/ic_notifications_tl.png and b/app/src/main/res/drawable-ldpi/ic_notifications_tl.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notifications_tl.png b/app/src/main/res/drawable-mdpi/ic_notifications_tl.png
index 81d09aef7..baa0ba032 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_notifications_tl.png and b/app/src/main/res/drawable-mdpi/ic_notifications_tl.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notifications_tl.png b/app/src/main/res/drawable-xhdpi/ic_notifications_tl.png
index 0c22d4926..cd28c1cee 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_notifications_tl.png and b/app/src/main/res/drawable-xhdpi/ic_notifications_tl.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notifications_tl.png b/app/src/main/res/drawable-xxhdpi/ic_notifications_tl.png
index bb99098c8..26a9a010f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notifications_tl.png and b/app/src/main/res/drawable-xxhdpi/ic_notifications_tl.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notifications_tl.png b/app/src/main/res/drawable-xxxhdpi/ic_notifications_tl.png
index e498a2f21..5fb84bb28 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_notifications_tl.png and b/app/src/main/res/drawable-xxxhdpi/ic_notifications_tl.png differ
diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml
deleted file mode 100644
index 478acaaf6..000000000
--- a/app/src/main/res/layout-sw600dp/activity_main.xml
+++ /dev/null
@@ -1,141 +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.v4.widget.DrawerLayout 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/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <android.support.design.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context="mastodon.etalab.gouv.fr.mastodon.fr.etalab.gouv.fr.mastodon.activities.MainActivity">
-
-        <android.support.design.widget.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="@style/AppTheme.AppBarOverlay"
-            >
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?attr/colorPrimary"
-                app:popupTheme="?attr/popupOverlay">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:id="@+id/toolbar_search_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="40dp"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:id="@+id/pp_actionBar"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="10dp"
-                            android:layout_marginRight="10dp"
-                            android:gravity="center_vertical"
-                            tools:ignore="ContentDescription"/>
-
-                        <TextView
-                            android:id="@+id/toolbar_title"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:layout_weight="1"
-                            android:textSize="16sp"/>
-
-                        <android.support.v7.widget.SearchView
-                            android:id="@+id/toolbar_search"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:background="@null"
-                            android:gravity="end"/>
-                    </LinearLayout>
-
-
-                </LinearLayout>
-            </android.support.v7.widget.Toolbar>
-            <android.support.design.widget.TabLayout
-                android:id="@+id/tabLayout"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                app:tabGravity="fill"
-                app:tabMaxWidth="0dp"
-                app:tabSelectedTextColor="?attr/colorAccent"/>
-        </android.support.design.widget.AppBarLayout>
-
-
-
-        <!-- Framelayout to display Fragments -->
-        <android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/viewpager"
-            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"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:context="mastodon.etalab.gouv.fr.mastodon.fr.etalab.gouv.fr.mastodon.activities.MainActivity"
-            >
-        </android.support.v4.view.ViewPager>
-
-        <!-- Framelayout to display Fragments -->
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:visibility="gone"
-            android:id="@+id/main_app_container"
-            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"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:context="mastodon.etalab.gouv.fr.mastodon.fr.etalab.gouv.fr.mastodon.activities.MainActivity"
-            >
-        </RelativeLayout>
-
-
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/toot"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            app:srcCompat="@drawable/ic_action_edit" />
-
-    </android.support.design.widget.CoordinatorLayout>
-
-    <android.support.design.widget.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="false"
-        app:headerLayout="@layout/nav_header_main"
-        app:menu="@menu/activity_main_drawer" />
-
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7dd25ee27..6096a5328 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -47,16 +47,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:orientation="horizontal">
-                    <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_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:visibility="gone"
                         android:layout_width="0dp"
                         android:layout_weight="1"