diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 584de1126b8..097ad01c7fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -59,22 +59,24 @@
         android:name=".MainApp"
         android:icon="@mipmap/icon"
         android:label="@string/app_name"
-        android:theme="@style/Theme.ownCloud"
+        android:theme="@style/Theme.ownCloud.Toolbar"
         android:manageSpaceActivity=".ui.activity.ManageSpaceActivity"
         android:resizeableActivity="true"
         android:supportsPictureInPicture="false" >
-        <activity android:name=".ui.activity.FileDisplayActivity" >
+        <activity
+            android:name=".ui.activity.FileDisplayActivity"
+            android:theme="@style/Theme.ownCloud.Toolbar.Drawer">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".ui.activity.ManageAccountsActivity" />
         <activity android:name=".ui.activity.UploadFilesActivity" />
         <activity android:name=".ui.activity.ReceiveExternalFilesActivity"
                   android:taskAffinity=""
-                  android:excludeFromRecents="true"
-                  android:theme="@style/Theme.ownCloud">
+                  android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -165,7 +167,7 @@
             android:name=".authentication.AuthenticatorActivity"
             android:exported="true"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.ownCloud.noActionBar" >
+            >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -186,15 +188,19 @@
         <service android:name=".files.services.FileUploader" />
         <service android:name=".media.MediaService" />
 
-        <activity android:name=".ui.activity.PassCodeActivity" />
-        <activity android:name=".ui.activity.ConflictsResolveActivity"/>
+        <activity android:name=".ui.activity.PassCodeActivity"
+            android:theme="@style/Theme.ownCloud"/>
+        <activity android:name=".ui.activity.ConflictsResolveActivity"
+            android:theme="@style/Theme.ownCloud"/>
         <activity android:name=".ui.activity.GenericExplanationActivity"/>
-        <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
+        <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"
+            android:theme="@style/Theme.ownCloud"/>
         
         <activity android:name=".ui.activity.LogHistoryActivity"/>
 
         <activity android:name=".ui.errorhandling.ErrorShowActivity" />
-        <activity android:name=".ui.activity.UploadListActivity" />
+        <activity android:name=".ui.activity.UploadListActivity"
+                  android:theme="@style/Theme.ownCloud.Toolbar.Drawer"/>
         
         <receiver android:name=".broadcastreceivers.ConnectivityActionReceiver"
             android:enabled="true" android:label="ConnectivityActionReceiver">
@@ -234,7 +240,7 @@
         <activity
             android:name=".ui.activity.ShareActivity"
             android:label="@string/share_dialog_title"
-            android:theme="@style/Theme.ownCloud.Dialog.NoTitle"
+            android:theme="@style/Theme.ownCloud.AlertDialog.NoTitle"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize" >
             <intent-filter>
diff --git a/build.gradle b/build.gradle
index fbb79318f17..56afe93022a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 apply plugin: 'com.android.application'
 
 ext {
-    supportLibraryVersion = '23.1.1'
+    supportLibraryVersion = '24.2.1'
 }
 
 repositories {
@@ -55,7 +55,10 @@ dependencies {
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
 
     // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
-    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
+    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+
+    // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
+    androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
 
 }
 
diff --git a/owncloud-android-library b/owncloud-android-library
index dc14474c51d..a13b5ec17c9 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit dc14474c51d19884629a190e24a8de42aba1a268
+Subproject commit a13b5ec17c9e9550e519a884fca0d428c4f96507
diff --git a/res/drawable-hdpi/ic_account_plus.png b/res/drawable-hdpi/ic_account_plus.png
new file mode 100644
index 00000000000..f3fc7aa18e8
Binary files /dev/null and b/res/drawable-hdpi/ic_account_plus.png differ
diff --git a/res/drawable-hdpi/ic_down.png b/res/drawable-hdpi/ic_down.png
new file mode 100644
index 00000000000..5cd8ab6613d
Binary files /dev/null and b/res/drawable-hdpi/ic_down.png differ
diff --git a/res/drawable-hdpi/ic_key.png b/res/drawable-hdpi/ic_key.png
new file mode 100644
index 00000000000..73bf0c00e0e
Binary files /dev/null and b/res/drawable-hdpi/ic_key.png differ
diff --git a/res/drawable-hdpi/ic_up.png b/res/drawable-hdpi/ic_up.png
new file mode 100644
index 00000000000..a17476a712a
Binary files /dev/null and b/res/drawable-hdpi/ic_up.png differ
diff --git a/res/drawable-mdpi/ic_account_plus.png b/res/drawable-mdpi/ic_account_plus.png
new file mode 100644
index 00000000000..8db5d3198a0
Binary files /dev/null and b/res/drawable-mdpi/ic_account_plus.png differ
diff --git a/res/drawable-mdpi/ic_down.png b/res/drawable-mdpi/ic_down.png
new file mode 100644
index 00000000000..23d8de81070
Binary files /dev/null and b/res/drawable-mdpi/ic_down.png differ
diff --git a/res/drawable-mdpi/ic_key.png b/res/drawable-mdpi/ic_key.png
new file mode 100644
index 00000000000..dcf345be5d7
Binary files /dev/null and b/res/drawable-mdpi/ic_key.png differ
diff --git a/res/drawable-mdpi/ic_up.png b/res/drawable-mdpi/ic_up.png
new file mode 100644
index 00000000000..b932a12a9d0
Binary files /dev/null and b/res/drawable-mdpi/ic_up.png differ
diff --git a/res/drawable-xhdpi/ic_account_plus.png b/res/drawable-xhdpi/ic_account_plus.png
new file mode 100644
index 00000000000..b4319c352e9
Binary files /dev/null and b/res/drawable-xhdpi/ic_account_plus.png differ
diff --git a/res/drawable-xhdpi/ic_down.png b/res/drawable-xhdpi/ic_down.png
new file mode 100644
index 00000000000..efc69c4a51a
Binary files /dev/null and b/res/drawable-xhdpi/ic_down.png differ
diff --git a/res/drawable-xhdpi/ic_key.png b/res/drawable-xhdpi/ic_key.png
new file mode 100644
index 00000000000..8b44a818160
Binary files /dev/null and b/res/drawable-xhdpi/ic_key.png differ
diff --git a/res/drawable-xhdpi/ic_up.png b/res/drawable-xhdpi/ic_up.png
new file mode 100644
index 00000000000..c2a8163d51c
Binary files /dev/null and b/res/drawable-xhdpi/ic_up.png differ
diff --git a/res/drawable-xxhdpi/ic_account_plus.png b/res/drawable-xxhdpi/ic_account_plus.png
new file mode 100644
index 00000000000..ba4edbd0545
Binary files /dev/null and b/res/drawable-xxhdpi/ic_account_plus.png differ
diff --git a/res/drawable-xxhdpi/ic_down.png b/res/drawable-xxhdpi/ic_down.png
new file mode 100644
index 00000000000..cacbf3e5162
Binary files /dev/null and b/res/drawable-xxhdpi/ic_down.png differ
diff --git a/res/drawable-xxhdpi/ic_key.png b/res/drawable-xxhdpi/ic_key.png
new file mode 100644
index 00000000000..27f889e984c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_key.png differ
diff --git a/res/drawable-xxhdpi/ic_up.png b/res/drawable-xxhdpi/ic_up.png
new file mode 100644
index 00000000000..f35d9fc95dc
Binary files /dev/null and b/res/drawable-xxhdpi/ic_up.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png
index 2444d8361bd..c0102e66b41 100644
Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png
index 35ca0a76270..9a05a95a35b 100644
Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png
index 94b63b5ca06..e16be25c8f2 100644
Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png
index efe4948de02..39eec04f9b5 100644
Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png
index e91efc5e7bd..d028289d17f 100644
Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png
index 815d093b2d1..d6f4f947543 100644
Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png
index c78647de59b..0a5db16c4ba 100644
Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png
index 1edad5a7037..a6111c305e1 100644
Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png differ
diff --git a/res/drawable/ic_current.png b/res/drawable/ic_current.png
new file mode 100644
index 00000000000..a0d859ac317
Binary files /dev/null and b/res/drawable/ic_current.png differ
diff --git a/res/drawable/ic_current_white.png b/res/drawable/ic_current_white.png
new file mode 100644
index 00000000000..de2fc111b62
Binary files /dev/null and b/res/drawable/ic_current_white.png differ
diff --git a/res/drawable/process_dialog_background.xml b/res/drawable/process_dialog_background.xml
deleted file mode 100644
index 9ba0b1e9ab8..00000000000
--- a/res/drawable/process_dialog_background.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white"/>
-    <padding
-        android:left="@dimen/standard_padding"
-        android:top="4dp"
-        android:right="@dimen/standard_padding"
-        android:bottom="4dp"/>
-    <corners
-        android:radius="2dp"/>
-</shape>
\ No newline at end of file
diff --git a/res/drawable/actionbar_progress_horizontal.xml b/res/drawable/top_progress_bar_determinate.xml
similarity index 70%
rename from res/drawable/actionbar_progress_horizontal.xml
rename to res/drawable/top_progress_bar_determinate.xml
index efcf09b41a7..84f79db0073 100644
--- a/res/drawable/actionbar_progress_horizontal.xml
+++ b/res/drawable/top_progress_bar_determinate.xml
@@ -4,15 +4,15 @@
 
     <item
         android:id="@android:id/background"
-        android:drawable="@color/transparent" />
+        android:drawable="@color/background_color" />
     <item android:id="@android:id/secondaryProgress">
         <scale
-            android:drawable="@color/owncloud_blue"
+            android:drawable="@color/actionbar_start_color"
             android:scaleWidth="100%" />
     </item>
     <item android:id="@android:id/progress">
         <scale
-            android:drawable="@color/owncloud_blue"
+            android:drawable="@color/actionbar_start_color"
             android:scaleWidth="100%" />
     </item>
 
diff --git a/res/drawable/actionbar_progress_indeterminate_horizontal.xml b/res/drawable/top_progress_bar_indeterminate.xml
similarity index 100%
rename from res/drawable/actionbar_progress_indeterminate_horizontal.xml
rename to res/drawable/top_progress_bar_indeterminate.xml
diff --git a/res/layout-v11/activity_row.xml b/res/layout-v11/activity_row.xml
deleted file mode 100644
index 3cacc4c1cea..00000000000
--- a/res/layout-v11/activity_row.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-<LinearLayout 	xmlns:android="http://schemas.android.com/apk/res/android"
-    			android:id="@+id/list_item"
-				android:layout_width="match_parent"
-				android:layout_height="48dp"
-				android:paddingStart="16dip"
-				android:paddingEnd="16dip"
-				android:paddingRight="16dip"
-				android:paddingLeft="16dip"
-				android:minWidth="196dip"
-				android:background="?android:attr/activatedBackgroundIndicator"
-				android:orientation="vertical"
-				android:filterTouchesWhenObscured="true">
-
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:duplicateParentState="true" >
-
-		<ImageView
-			android:id="@+id/icon"
-			android:layout_width="40dip"
-			android:layout_height="40dip"
-			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="8dip"
-			android:layout_marginRight="8dip"
-			android:duplicateParentState="true" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-            android:duplicateParentState="true"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v11/notification_with_progress_bar.xml b/res/layout-v11/notification_with_progress_bar.xml
deleted file mode 100644
index 8a0057ab312..00000000000
--- a/res/layout-v11/notification_with_progress_bar.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-    ownCloud Android client application
-    Copyright (C) 2015 ownCloud Inc.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2,
-    as published by the Free Software Foundation.
-  
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:filterTouchesWhenObscured="true"
-    >
-    <ImageView android:id="@+id/icon"
-        android:layout_width="@android:dimen/notification_large_icon_width"
-        android:layout_height="@android:dimen/notification_large_icon_height"
-        android:scaleType="center"
-        />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:minHeight="64dp"
-        android:orientation="vertical"
-        android:paddingRight="12dp"
-        android:paddingLeft="12dp"
-        >
-		<TextView android:id="@+id/title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            style="@style/Theme.ownCloud.NotificationText.Title"
-        	/>
-        <TextView android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-2dp"
-            android:layout_marginBottom="-2dp"
-            android:singleLine="true"
-            android:fadingEdge="horizontal"
-            android:ellipsize="marquee"
-            style="@style/Theme.ownCloud.NotificationText.Content"
-            />
-        <FrameLayout android:id="@+id/progressHolder"
-            android:layout_width="match_parent"
-            android:layout_height="12dp"
-            >
-            <!--  the FrameLayout is needed to change visibility of the
-            	progress bar in Android 2.2, even though 
-            	https://code.google.com/p/android/issues/detail?id=11040 -->
-	        <ProgressBar
-	            android:id="@+id/progress"
-	            android:layout_width="match_parent"
-	            android:layout_height="match_parent"
-	            style="?android:attr/progressBarStyleHorizontal"
-	            />
-        </FrameLayout>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml
deleted file mode 100644
index 8d2ee1457b7..00000000000
--- a/res/layout-v14/generic_explanation.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  ownCloud Android client application
-
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_color" 
-    android:id="@+id/explanation"
-    android:orientation="vertical"
-    android:filterTouchesWhenObscured="true">
-
-	<TextView
-		android:id="@+id/message"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="2"
-	    android:padding="10dip"
-	    android:scrollbarAlwaysDrawVerticalTrack="true"
-		android:text="@string/placeholder_sentence" 
-		/>
-    
-	<ListView 
-	    android:id="@+id/list"
-	    android:layout_width="match_parent"
-	    android:layout_height="0dp"
-		android:layout_weight="3"
-	    android:padding="10dip"
-	    />
-	    
-    <LinearLayout
-        android:id="@+id/buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal" >
-
-        <!-- 'OK' / 'CANCEL' BUTTONS CHANGE THEIR ORDER FROM ANDROID 4.0 ; THANKS, GOOGLE -->
-        <Button
-            android:id="@+id/cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/common_cancel" />
-
-		<Button
-		    android:id="@+id/ok"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="1"
-		    android:text="@string/common_ok" />
-		
-	</LinearLayout>
-	
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/account_action.xml b/res/layout/account_action.xml
new file mode 100644
index 00000000000..6f9d2b210ad
--- /dev/null
+++ b/res/layout/account_action.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2016 ownCloud GmbH.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="72dp"
+    android:orientation="horizontal"
+    android:weightSum="1">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
+        android:src="@drawable/ic_account_plus"/>
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="28dp"
+        android:layout_marginStart="20dp"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:paddingRight="@dimen/standard_padding"
+        android:paddingEnd="@dimen/standard_padding"
+        android:text="@string/placeholder_filename"
+        android:textColor="@color/primary"
+        android:textSize="@dimen/two_line_primary_text_size"/>
+
+</LinearLayout>         
\ No newline at end of file
diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml
new file mode 100644
index 00000000000..f6a79fe5863
--- /dev/null
+++ b/res/layout/account_item.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2016 ownCloud GmbH.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="80dp"
+    >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="@dimen/standard_margin"
+        android:layout_marginStart="@dimen/standard_margin"
+        android:src="@drawable/ic_account_plus"
+        />
+
+    <ImageView
+        android:id="@+id/ticker"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_alignRight="@id/icon"
+        android:layout_alignEnd="@id/icon"
+        android:layout_alignTop="@id/icon"
+        android:layout_marginRight="-8dp"
+        android:layout_marginEnd="-8dp"
+        android:layout_marginTop="-8dp"
+        android:src="@drawable/ic_current"
+        />
+        <!-- drawable will be replaced by ic_current_white + tint in runtime;
+        ic_current here as a placeholder -->
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="match_parent"
+        android:layout_height="28dp"
+        android:layout_marginLeft="@dimen/standard_margin"
+        android:layout_marginStart="@dimen/standard_margin"
+        android:layout_marginRight="@dimen/standard_half_margin"
+        android:layout_marginEnd="@dimen/standard_half_margin"
+        android:layout_marginTop="4dp"
+        android:layout_toRightOf="@id/icon"
+        android:layout_toEndOf="@id/icon"
+        android:layout_toLeftOf="@+id/passwordButton"
+        android:layout_toStartOf="@id/passwordButton"
+        android:layout_alignParentTop="true"
+        android:gravity="bottom"
+        android:text="@string/placeholder_filename"
+        android:textColor="@color/textColor"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:maxLines="1"
+        android:ellipsize="end"/>
+
+    <TextView
+        android:id="@+id/account"
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:layout_marginLeft="@dimen/standard_margin"
+        android:layout_marginStart="@dimen/standard_margin"
+        android:layout_marginRight="@dimen/standard_half_margin"
+        android:layout_marginEnd="@dimen/standard_half_margin"
+        android:layout_marginBottom="4dp"
+        android:layout_toRightOf="@id/icon"
+        android:layout_toEndOf="@id/icon"
+        android:layout_toLeftOf="@id/passwordButton"
+        android:layout_toStartOf="@id/passwordButton"
+        android:layout_alignParentBottom="true"
+        android:layout_below="@id/name"
+        android:gravity="top"
+        android:text="@string/placeholder_sentence"
+        android:textColor="@color/textColor"
+        android:textSize="14sp"
+        android:maxLines="2"
+        android:ellipsize="end"/>
+
+    <ImageView
+        android:id="@id/passwordButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_toLeftOf="@+id/removeButton"
+        android:layout_toStartOf="@id/removeButton"
+        android:layout_centerInParent="true"
+        android:paddingLeft="@dimen/standard_half_padding"
+        android:paddingTop="@dimen/standard_padding"
+        android:paddingBottom="@dimen/standard_padding"
+        android:paddingRight="@dimen/standard_half_padding"
+        android:src="@drawable/ic_key"/>
+
+    <ImageView
+        android:id="@id/removeButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_centerInParent="true"
+        android:paddingLeft="@dimen/standard_half_padding"
+        android:paddingStart="@dimen/standard_half_padding"
+        android:paddingTop="@dimen/standard_padding"
+        android:paddingBottom="@dimen/standard_padding"
+        android:paddingRight="@dimen/standard_padding"
+        android:paddingEnd="@dimen/standard_padding"
+        android:src="@drawable/ic_action_delete_grey"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/drawer_radiobutton.xml b/res/layout/accounts_layout.xml
similarity index 57%
rename from res/layout/drawer_radiobutton.xml
rename to res/layout/accounts_layout.xml
index 22d6ceb79b5..b9540b366da 100644
--- a/res/layout/drawer_radiobutton.xml
+++ b/res/layout/accounts_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- 
   ownCloud Android client application
 
   Copyright (C) 2016 ownCloud GmbH.
@@ -15,15 +15,23 @@
 
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_radiobutton"
-    android:layout_width="fill_parent"
-    android:layout_height="56dp"
-    android:gravity="center_vertical"
-    android:paddingLeft="@dimen/standard_padding"
-    android:paddingRight="@dimen/standard_padding"
-    android:textColor="@color/black"
-    android:textSize="18dp"
-    android:filterTouchesWhenObscured="true"
-    />
\ No newline at end of file
+ -->
+<LinearLayout
+	android:id="@+id/accounts_layout"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<include
+		layout="@layout/toolbar_standard"/>
+
+	<ListView
+		android:id="@+id/account_list"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@color/list_divider_background"
+		android:dividerHeight="1dip">
+	</ListView>
+
+</LinearLayout>
diff --git a/res/layout/action_item.xml b/res/layout/action_item.xml
index 7783f59aa8b..318fe56cd79 100644
--- a/res/layout/action_item.xml
+++ b/res/layout/action_item.xml
@@ -20,7 +20,7 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal"
-	android:layout_width="fill_parent"
+	android:layout_width="match_parent"
 	android:layout_height="wrap_content" 
 	android:clickable="true"
 	android:focusable="true"
@@ -35,8 +35,8 @@
 
 	<TextView 
 		android:id="@+id/title"
-		android:layout_width="fill_parent" 
-		android:layout_height="fill_parent" 
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
 		android:gravity="center_vertical"
 		android:paddingLeft="5dip"
 		android:paddingRight="10dip"
diff --git a/res/layout/activity_row.xml b/res/layout/activity_row.xml
index 7ebb382dbb2..fca25aa1b87 100644
--- a/res/layout/activity_row.xml
+++ b/res/layout/activity_row.xml
@@ -2,7 +2,7 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2016 ownCloud GmbH.
+  Copyright (C) 2015 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -26,13 +26,9 @@
 				android:paddingRight="16dip"
 				android:paddingLeft="16dip"
 				android:minWidth="196dip"
-<<<<<<< f61afd89e6d873028a0e921f354676f3a8f55f02
 				android:background="?android:attr/activatedBackgroundIndicator"
-    			android:orientation="vertical" >
-=======
 				android:orientation="vertical"
 				android:filterTouchesWhenObscured="true">
->>>>>>> Add `android:filterTouchesWhenObscured`
 
 	<LinearLayout
 		android:layout_width="wrap_content"
diff --git a/res/layout/drawer.xml b/res/layout/drawer.xml
index 97ea8127a74..e19c12dc554 100644
--- a/res/layout/drawer.xml
+++ b/res/layout/drawer.xml
@@ -16,89 +16,18 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <RelativeLayout
-        android:id="@+id/left_drawer"
-        android:layout_width="240dp"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <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:gravity="center"
-        android:orientation="vertical"
         android:fitsSystemWindows="true"
-        android:background="@color/background_color"
         android:filterTouchesWhenObscured="true"
-        >
-
-        <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
-        <!--<LinearLayout-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_margin="5dp">-->
-
-            <!--<ImageView-->
-                <!--android:id="@+id/drawer_userIcon"-->
-                <!--android:layout_width="40dp"-->
-                <!--android:layout_height="40dp"-->
-                <!--android:src="@drawable/abc_ab_bottom_solid_dark_holo" />-->
-
-            <!--<TextView-->
-                <!--android:id="@+id/drawer_username"-->
-                <!--android:layout_width="wrap_content"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:layout_gravity="center_vertical"-->
-                <!--android:layout_marginLeft="5dp"-->
-                <!--android:layout_marginStart="5dp"-->
-                <!--android:textAppearance="?android:attr/textAppearanceLarge" />-->
-
-        <!--</LinearLayout>-->
-
-        <!--<TextView-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="2dip"-->
-            <!--android:background="@color/list_item_lastmod_and_filesize_text" />-->
-
-        <ListView
-            android:id="@+id/drawer_list"
-            android:choiceMode="singleChoice"
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"
-            android:background="@color/background_color"
-            android:divider="@null"
-            android:dividerHeight="0dp"
-            android:paddingTop="100dp" />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="100dp"
-            android:paddingTop="@dimen/standard_padding"
-            android:paddingBottom="@dimen/standard_padding"
-            android:background="@color/drawer_header_color">
-
-            <ImageView
-                android:id="@+id/itemIcon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginLeft="@dimen/standard_padding"
-                android:layout_marginBottom="3dp"
-                android:layout_gravity="bottom"
-                android:src="@drawable/ic_account_circle"
-                />
+        app:theme="@style/NavigationView_ItemTextAppearance"
+        app:headerLayout="@layout/drawer_header"
+        app:menu="@menu/drawer_menu"/>
 
-            <TextView
-                android:id="@+id/drawer_username"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:gravity="bottom"
-                android:orientation="vertical"
-                android:text="@string/app_name"
-                android:textColor="#FFF"
-                android:paddingLeft="22dp"
-                android:paddingRight="@dimen/standard_padding"
-                android:textSize="24sp"
-                android:ellipsize="end"
-                android:singleLine="true"
-                />
-        </LinearLayout>
-    </RelativeLayout>
 </merge>
\ No newline at end of file
diff --git a/res/layout/drawer_account_group.xml b/res/layout/drawer_account_group.xml
deleted file mode 100644
index 01fcddd10dc..00000000000
--- a/res/layout/drawer_account_group.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<RadioGroup
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_radio_group"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:orientation="vertical"
-    android:filterTouchesWhenObscured="true"
-    >
-</RadioGroup>
\ No newline at end of file
diff --git a/res/layout/drawer_header.xml b/res/layout/drawer_header.xml
new file mode 100644
index 00000000000..2781e0e55ed
--- /dev/null
+++ b/res/layout/drawer_header.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2016 ownCloud GmbH.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_active_user"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/nav_drawer_header_height"
+    android:gravity="bottom"
+    android:padding="@dimen/standard_padding"
+    android:background="@color/drawer_header_color"
+    >
+
+    <ImageView
+        android:id="@+id/drawer_current_account"
+        android:layout_width="@dimen/nav_drawer_header_avatar"
+        android:layout_height="@dimen/nav_drawer_header_avatar"
+        android:layout_above="@+id/drawer_username"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginBottom="@dimen/standard_half_margin"
+        android:src="@drawable/ic_account_circle"/>
+
+    <ImageView
+        android:id="@+id/drawer_account_middle"
+        android:layout_width="@dimen/nav_drawer_header_avatar_other_accounts_size"
+        android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size"
+        android:layout_alignTop="@id/drawer_current_account"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="@dimen/nav_drawer_header_avatar_second_account_margin"
+        android:layout_marginRight="@dimen/nav_drawer_header_avatar_second_account_margin"
+        android:src="@drawable/ic_account_circle"
+        android:onClick="onAccountDrawerClick"/>
+
+    <ImageView
+        android:id="@+id/drawer_account_end"
+        android:layout_width="@dimen/nav_drawer_header_avatar_other_accounts_size"
+        android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size"
+        android:layout_alignTop="@id/drawer_current_account"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:src="@drawable/ic_account_circle"
+        android:onClick="onAccountDrawerClick"/>
+
+    <TextView
+        android:id="@id/drawer_username"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/drawer_username_full"
+        android:layout_toLeftOf="@+id/drawer_account_chooser_toogle"
+        android:layout_toStartOf="@id/drawer_account_chooser_toogle"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:paddingRight="@dimen/standard_half_padding"
+        android:paddingEnd="@dimen/standard_half_padding"
+        android:ellipsize="end"
+        android:shadowColor="@color/black"
+        android:shadowDx="0.5"
+        android:shadowDy="0"
+        android:shadowRadius="2"
+        android:maxLines="1"
+        android:text="@string/app_name"
+        android:textColor="@android:color/white"
+        android:textSize="14sp"
+        android:textStyle="bold"/>
+
+    <TextView
+        android:id="@id/drawer_username_full"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_toLeftOf="@id/drawer_account_chooser_toogle"
+        android:layout_toStartOf="@id/drawer_account_chooser_toogle"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:paddingRight="@dimen/standard_half_padding"
+        android:paddingEnd="@dimen/standard_half_padding"
+        android:ellipsize="end"
+        android:lines="1"
+        android:maxLines="1"
+        android:shadowColor="@color/black"
+        android:shadowDx="0.5"
+        android:shadowDy="0"
+        android:shadowRadius="2"
+        android:text="@string/app_name"
+        android:textColor="@android:color/white"
+        android:textSize="12sp"/>
+
+    <ImageView
+        android:id="@id/drawer_account_chooser_toogle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:contentDescription="@string/drawer_manage_accounts"
+        android:src="@drawable/ic_down"
+        />
+
+</RelativeLayout>
diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml
deleted file mode 100644
index 481a33b70f8..00000000000
--- a/res/layout/drawer_list_item.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2016 ownCloud GmbH.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/itemLayout"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentLeft="true"
-    android:orientation="horizontal"
-    android:background="@color/background_color"
-    android:layout_marginTop="@dimen/standard_margin"
-    android:layout_marginBottom="@dimen/standard_margin"
-    android:minHeight="?android:attr/listPreferredItemHeight">
-    android:filterTouchesWhenObscured="true"
-    >
-
-    <ImageView
-        android:id="@+id/itemIcon"
-        android:layout_width="24sp"
-        android:layout_height="24sp"
-        android:layout_marginLeft="@dimen/standard_margin"
-        android:layout_gravity="center_vertical"
-        />
-
-    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/itemTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="22dp"
-        android:paddingRight="@dimen/standard_margin"
-        android:textColor="@color/drawerMenuTextColor"
-        android:text="@string/app_name"
-        android:textStyle="normal"
-        android:layout_gravity="center_vertical"
-        android:textSize="14sp"
-        />
-</LinearLayout>
-
diff --git a/res/layout/files.xml b/res/layout/files.xml
index aff6d1f1ae7..a74dbade412 100644
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@ -18,35 +18,47 @@
   along with this program.  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"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:clickable="true"
-    android:filterTouchesWhenObscured="true">
+    android:filterTouchesWhenObscured="true"
+    android:fitsSystemWindows="true"
+    android:clickable="true" >
 
     <!-- The main content view -->
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background_color"
+        android:orientation="vertical">
 
-        android:orientation="horizontal"
-        android:id="@+id/ListLayout"
-        android:contentDescription="@string/list_layout"
-        >
+        <include
+            layout="@layout/toolbar_standard" />
 
-        <FrameLayout
-            android:id="@+id/left_fragment_container"
-            android:layout_width="0dp"
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1" />
+            android:background="@color/background_color"
+
+            android:orientation="horizontal"
+            android:id="@+id/ListLayout"
+            android:contentDescription="@string/list_layout"
+            >
+
+            <FrameLayout
+                android:id="@+id/left_fragment_container"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <FrameLayout
+                android:id="@+id/right_fragment_container"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2" />
+        </LinearLayout>
 
-        <FrameLayout
-            android:id="@+id/right_fragment_container"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="2" />
     </LinearLayout>
 
     <include
diff --git a/res/layout/files_folder_picker.xml b/res/layout/files_folder_picker.xml
index 4e6490b17a8..937585db0c7 100644
--- a/res/layout/files_folder_picker.xml
+++ b/res/layout/files_folder_picker.xml
@@ -19,21 +19,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
-    android:orientation="vertical"
-    android:filterTouchesWhenObscured="true">
+    android:filterTouchesWhenObscured="true"
+    android:orientation="vertical" >
 
-    <ProgressBar android:id="@+id/progressBar"
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:padding="0dp"
-        android:layout_margin="0dp"
-        style="@style/Widget.ownCloud.TopProgressBar"
-        android:indeterminate="false"
-        android:indeterminateOnly="false"
-        android:background="@color/background_color"
-        android:visibility="visible"
-        />
+    <include
+        layout="@layout/toolbar_standard" />
 
 	<FrameLayout 
 		android:layout_width="match_parent"
diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index 916ae0a8249..2ebe7f86765 100644
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -2,7 +2,7 @@
 <!-- 
   ownCloud Android client application
 
-  Copyright (C) 2016 ownCloud GmbH.
+  Copyright (C) 2015 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -49,17 +49,16 @@
         android:gravity="center"
         android:orientation="horizontal" >
 
-        <android.support.v7.widget.AppCompatButton
+        <!-- 'OK' / 'CANCEL' BUTTONS CHANGE THEIR ORDER FROM ANDROID 4.0 ; THANKS, GOOGLE -->
+        <Button
             android:id="@+id/cancel"
-            android:theme="@style/Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
-        <android.support.v7.widget.AppCompatButton
+		<Button
 		    android:id="@+id/ok"
-            android:theme="@style/Button.Primary"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="1"
diff --git a/res/layout/log_send_file.xml b/res/layout/log_send_file.xml
index 6f94785b034..4ed4c78ad36 100644
--- a/res/layout/log_send_file.xml
+++ b/res/layout/log_send_file.xml
@@ -25,6 +25,9 @@
     android:filterTouchesWhenObscured="true"
     >
 
+    <include
+        layout="@layout/toolbar_standard" />
+
     <ScrollView
         android:id="@+id/scrollView1"
         android:layout_width="match_parent"
@@ -50,7 +53,7 @@
 
     <LinearLayout
         android:id="@+id/historyButtonBar"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:layout_marginBottom="@dimen/standard_margin"
@@ -60,7 +63,7 @@
     <android.support.v7.widget.AppCompatButton
         android:id="@+id/deleteLogHistoryButton"
         android:theme="@style/Button"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:layout_weight="1"
@@ -69,7 +72,7 @@
     <android.support.v7.widget.AppCompatButton
         android:id="@+id/sendLogHistoryButton"
         android:theme="@style/Button.Primary"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:layout_weight="1"
diff --git a/res/layout/notification_with_progress_bar.xml b/res/layout/notification_with_progress_bar.xml
deleted file mode 100644
index 1c427687ef0..00000000000
--- a/res/layout/notification_with_progress_bar.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-    ownCloud Android client application
-    Copyright (C) 2016 ownCloud GmbH.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2,
-    as published by the Free Software Foundation.
-  
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-<<<<<<< f61afd89e6d873028a0e921f354676f3a8f55f02
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <ImageView android:id="@+id/icon"
-        android:layout_width="@android:dimen/notification_large_icon_width"
-        android:layout_height="@android:dimen/notification_large_icon_height"
-        android:scaleType="center"
-        />
-=======
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingTop="5dp"
-        android:paddingLeft="5dp"
-        android:filterTouchesWhenObscured="true"
-        >
->>>>>>> Add `android:filterTouchesWhenObscured`
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:minHeight="64dp"
-        android:orientation="vertical"
-        android:paddingRight="12dp"
-        android:paddingLeft="12dp"
-        >
-		<TextView android:id="@+id/title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            style="@style/Theme.ownCloud.NotificationText.Title"
-        	/>
-        <TextView android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-2dp"
-            android:layout_marginBottom="-2dp"
-            android:singleLine="true"
-            android:fadingEdge="horizontal"
-            android:ellipsize="marquee"
-            style="@style/Theme.ownCloud.NotificationText.Content"
-            />
-        <FrameLayout android:id="@+id/progressHolder"
-            android:layout_width="match_parent"
-            android:layout_height="12dp"
-            >
-            <!--  the FrameLayout is needed to change visibility of the
-            	progress bar in Android 2.2, even though 
-            	https://code.google.com/p/android/issues/detail?id=11040 -->
-	        <ProgressBar
-	            android:id="@+id/progress"
-	            android:layout_width="match_parent"
-	            android:layout_height="match_parent"
-	            style="?android:attr/progressBarStyleHorizontal"
-	            />
-        </FrameLayout>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preview_audio_fragment.xml b/res/layout/preview_audio_fragment.xml
index 8da0200d73f..60f5ce2a353 100644
--- a/res/layout/preview_audio_fragment.xml
+++ b/res/layout/preview_audio_fragment.xml
@@ -24,7 +24,6 @@
     android:id="@+id/top"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
     android:gravity="center"
     tools:context=".ui.preview.PreviewAudioFragment"
     android:filterTouchesWhenObscured="true">
diff --git a/res/layout/preview_image_activity.xml b/res/layout/preview_image_activity.xml
index 7eec8cf1ec2..cc46b95511b 100644
--- a/res/layout/preview_image_activity.xml
+++ b/res/layout/preview_image_activity.xml
@@ -17,30 +17,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
+<com.ortiz.touch.ExtendedViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragmentPager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:clickable="true"
-    android:filterTouchesWhenObscured="true">
-
-    <com.ortiz.touch.ExtendedViewPager
-        android:id="@+id/fragmentPager"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent" 
-		/>
-
-    <include
-        layout="@layout/drawer"
-        android:layout_width="240dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"/>
-    
-    <!-- LinearLayout
-        android:id="@+id/fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-            <!- - Preview: layout=@layout/preview_image_fragment - ->
-    </LinearLayout -->
-
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+    android:filterTouchesWhenObscured="true"
+    />
diff --git a/res/layout/preview_text_fragment.xml b/res/layout/preview_text_fragment.xml
index 90acf001bce..530c0f96610 100644
--- a/res/layout/preview_text_fragment.xml
+++ b/res/layout/preview_text_fragment.xml
@@ -22,7 +22,6 @@
     android:id="@+id/top"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
     android:gravity="center"
     tools:context=".ui.preview.PreviewAudioFragment"
     android:filterTouchesWhenObscured="true"
diff --git a/res/layout/preview_video_fragment.xml b/res/layout/preview_video_fragment.xml
index 1ce5e2c561e..3c6436b1367 100644
--- a/res/layout/preview_video_fragment.xml
+++ b/res/layout/preview_video_fragment.xml
@@ -24,7 +24,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
     android:gravity="center"
     tools:context=".ui.preview.PreviewAudioFragment"
     android:filterTouchesWhenObscured="true"
diff --git a/res/drawable/split_action_bg.xml b/res/layout/toolbar_standard.xml
similarity index 62%
rename from res/drawable/split_action_bg.xml
rename to res/layout/toolbar_standard.xml
index 51647d55cb6..26adaadc9af 100644
--- a/res/drawable/split_action_bg.xml
+++ b/res/layout/toolbar_standard.xml
@@ -2,7 +2,6 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
   Copyright (C) 2016 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
@@ -17,10 +16,15 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:startColor="#D0D0D0" 
-        android:endColor="#CCCCCC"
-        android:angle="90"
-     />
-</shape>
\ No newline at end of file
+
+<android.support.v7.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="?attr/colorPrimary"
+    android:theme="?attr/actionBarTheme"
+    app:popupTheme="?attr/actionBarPopupTheme"
+/>
+
diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index 1c6d80c8450..909ae26b6b0 100644
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -17,12 +17,15 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/upload_files_layout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@color/background_color"
-    android:orientation="vertical"
-    android:filterTouchesWhenObscured="true" >
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
+    android:orientation="vertical" >
+
+    <include
+        layout="@layout/toolbar_standard" />
 
     <fragment
         android:id="@+id/local_files_list"
@@ -53,7 +56,7 @@
 
         <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/drawer_radio_group"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:orientation="horizontal">
diff --git a/res/layout/upload_list_layout.xml b/res/layout/upload_list_layout.xml
index 01a476e5bb4..b5a0fe0aeba 100755
--- a/res/layout/upload_list_layout.xml
+++ b/res/layout/upload_list_layout.xml
@@ -1,20 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2016 ownCloud GmbH.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
 <android.support.v4.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="true"
-    >
+    android:fitsSystemWindows="true">
 
+    <!-- The main content view -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background_color">
+        android:orientation="vertical">
+
+        <include
+            layout="@layout/toolbar_standard"/>
 
         <FrameLayout
             android:id="@+id/upload_list_fragment"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:background="@color/background_color"/>
     </LinearLayout>
 
     <include
diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 92c4a3217f2..b644a7109c2 100644
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -17,27 +17,28 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@color/white"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/upload_files_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
-    android:gravity="center"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical" >
+
+    <include
+        layout="@layout/toolbar_standard" />
 
     <FrameLayout
         android:id="@+id/upload_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/upload_actions"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         >
 
         <ListView
             android:id="@android:id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:divider="@color/list_divider_background"
             android:dividerHeight="1dip"
             >
@@ -45,19 +46,23 @@
 
     </FrameLayout>
 
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:src="@drawable/uploader_list_separator"/>
+
     <LinearLayout
         android:id="@+id/upload_actions"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
+        android:gravity="center"
         android:orientation="horizontal"
-        android:padding="@dimen/standard_padding"
-        >
+        android:padding="@dimen/standard_padding">
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/uploader_cancel"
             style="@style/ownCloud.Button"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:layout_weight="1"
@@ -67,7 +72,7 @@
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/uploader_choose_folder"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:layout_weight="1"
@@ -76,4 +81,4 @@
             />
 
     </LinearLayout>
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/menu/drawer_menu.xml b/res/menu/drawer_menu.xml
new file mode 100644
index 00000000000..6b5263b3afd
--- /dev/null
+++ b/res/menu/drawer_menu.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2016 ownCloud GmbH.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--
+      standard menu
+      all items in this group MUST have orderInCategory="0" set
+    -->
+    <group android:id="@+id/drawer_menu_standard" android:checkableBehavior="single">
+        <item
+            android:orderInCategory="0"
+            android:id="@+id/nav_all_files"
+            android:icon="@drawable/ic_folder_open"
+            android:title="@string/drawer_item_all_files"/>
+        <!-- TODO activate when On Device branch is merged
+        <item
+            android:orderInCategory="0"
+            android:id="@+id/nav_on_device"
+            android:icon="@drawable/ic_action_download_grey"
+            android:title="@string/drawer_item_on_device"/>
+         -->
+        <item
+            android:orderInCategory="0"
+            android:id="@+id/nav_uploads"
+            android:icon="@drawable/ic_uploads"
+            android:title="@string/drawer_item_uploads_list"/>
+    </group>
+
+    <!--
+      account list placeholder
+      all items in this group MUST have orderInCategory="2" set
+      all accounts are dynamically added with orderInCategory="1" set
+    -->
+    <group android:id="@+id/drawer_menu_accounts">
+        <item
+            android:orderInCategory="2"
+            android:id="@+id/drawer_menu_account_add"
+            android:icon="@drawable/ic_account_plus"
+            android:title="@string/prefs_add_account"/>
+        <item
+            android:orderInCategory="2"
+            android:id="@+id/drawer_menu_account_manage"
+            android:icon="@drawable/ic_settings"
+            android:title="@string/drawer_manage_accounts"/>
+    </group>
+
+    <!--
+      all items in this group MUST have orderInCategory="3" set
+    -->
+    <group>
+        <item
+            android:orderInCategory="3"
+            android:id="@+id/nav_settings"
+            android:icon="@drawable/ic_settings"
+            android:title="@string/actionbar_settings"/>
+    </group>
+</menu>
\ No newline at end of file
diff --git a/res/drawable/main_header_bg.xml b/res/values-sw360dp/dims.xml
similarity index 67%
rename from res/drawable/main_header_bg.xml
rename to res/values-sw360dp/dims.xml
index 4f5d46cc8ed..54ac0c33534 100644
--- a/res/drawable/main_header_bg.xml
+++ b/res/values-sw360dp/dims.xml
@@ -2,7 +2,6 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
   Copyright (C) 2016 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
@@ -17,11 +16,10 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:startColor="@color/actionbar_start_color" 
-        android:endColor="@color/actionbar_end_color"
-        android:angle="270"
-     />
-    <corners android:radius="0dp" />
-</shape>
\ No newline at end of file
+<resources>
+  <!-- Default screen margins, per the Android Design guidelines. -->
+  <dimen name="nav_drawer_header_height">164dp</dimen>
+  <dimen name="nav_drawer_header_avatar">64dp</dimen>
+  <!-- avatar radius needs to 1/2 of the avatar dp value -->
+  <dimen name="nav_drawer_header_avatar_radius">32dp</dimen>
+</resources>
diff --git a/res/values-v11/versioned_styles.xml b/res/values-v11/versioned_styles.xml
deleted file mode 100644
index 4fdc2124c1b..00000000000
--- a/res/values-v11/versioned_styles.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<!-- Notifications -->
-	<style 	name="Theme.ownCloud.NotificationText.Title" 
-	    	parent="@android:style/TextAppearance.StatusBar.EventContent.Title" > 
-		<item name="android:textSize">18sp</item>
-        <item name="android:textStyle">bold</item>
-	</style>
-
-	<style 	name="Theme.ownCloud.NotificationText.Content" 
-	    	parent="@android:style/TextAppearance.StatusBar.EventContent"	>
-        <item name="android:textSize">16sp</item>
-	</style>
-	
-</resources>
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 885c159bb29..db9f5bb4e22 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -17,12 +17,18 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
-	</style>
-    <style name="Theme.ownCloud.NoActionBar">
-        <item name="windowActionBar">false</item>
+
+    <!-- Extends Theme.ownCloud to remove legacy ActionBar from the window and add, via layouts, a Toolbar -->
+    <style name="Theme.ownCloud.Toolbar">
         <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+
+        <!-- (status/nav)BarColor are set by the Activity, not the system -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+    </style>
+
+    <!-- Extends Theme.ownCloud.Toolbar for Drawer activities including Drawwer -->
+    <style name="Theme.ownCloud.Toolbar.Drawer">
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/res/values-v9/versioned_styles.xml b/res/values-v9/versioned_styles.xml
deleted file mode 100644
index 57bb396f5d9..00000000000
--- a/res/values-v9/versioned_styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-	
-	<!-- Notifications -->
-	<style name="Theme.ownCloud.NotificationText.Title" 
-	    parent="@android:style/TextAppearance.StatusBar.EventContent.Title" 
-	    />
-	<style name="Theme.ownCloud.NotificationText.Content" 
-	    parent="@android:style/TextAppearance.StatusBar.EventContent" 
-	    />
-	
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0418de00a6e..26b6f36b54d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,7 +19,14 @@
 -->
 <resources>
 
-    <color name="owncloud_blue">@color/actionbar_start_color</color>
+    <!-- standard material color definitions -->
+    <color name="primary">@color/owncloud_blue</color>
+    <color name="primary_dark">#162233</color>
+    <color name="color_accent">@color/owncloud_blue_accent</color>
+
+
+    <!-- Colors -->
+    <color name="owncloud_blue">#1D2D44</color>
     <color name="owncloud_blue_accent">#35537A</color>
     <color name="owncloud_blue_bright">#00ddff</color>
 
@@ -41,14 +48,8 @@
     <color name="listItemHighlighted">#f8f8f8</color>
     <color name="highlightTextColor">#55739a</color>
 
-    <!-- Colors -->
-    <color name="color_accent">@color/owncloud_blue_accent</color>
     <color name="dialog_list_item">#1F1F1F</color>
 
-    <!-- standard material color definitions -->
-    <color name="primary">@color/owncloud_blue</color>
-    <color name="primary_dark">#162233</color>
-
     <!-- special transparent action bar colors for image preview -->
     <color name="owncloud_blue_transparent">#201D2D44</color>
     <color name="owncloud_blue_dark_transparent">#40162233</color>
diff --git a/res/values/dims.xml b/res/values/dims.xml
index dbc6a3c01c7..478481b82eb 100644
--- a/res/values/dims.xml
+++ b/res/values/dims.xml
@@ -21,9 +21,20 @@
     <dimen name="activity_horizontal_margin">@dimen/standard_padding</dimen>
     <dimen name="activity_vertical_margin">@dimen/standard_padding</dimen>
     <dimen name="nav_drawer_width">260dp</dimen>
+    <dimen name="nav_drawer_header_height">140dp</dimen>
+    <dimen name="nav_drawer_header_avatar">56dp</dimen>
+    <!-- avatar radius needs to 1/2 of the avatar dp value -->
+    <dimen name="nav_drawer_header_avatar_radius">28dp</dimen>
+    <dimen name="nav_drawer_header_avatar_other_accounts_size">40dp</dimen>
+    <dimen name="nav_drawer_header_avatar_other_accounts_radius">20dp</dimen>
+    <!-- margin must be nav_drawer_header_avatar_other_accounts_size+16dp -->
+    <dimen name="nav_drawer_header_avatar_second_account_margin">56dp</dimen>
+    <dimen name="nav_drawer_menu_avatar_radius">12sp</dimen>
+    <dimen name="list_item_avatar_icon_radius">20dp</dimen>
 
     <dimen name="file_icon_size">32dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
+    <dimen name="file_avatar_size">128dp</dimen>
     <dimen name="standard_padding">16dp</dimen>
     <dimen name="standard_half_padding">8dp</dimen>
     <dimen name="standard_margin">16dp</dimen>
diff --git a/res/values/setup.xml b/res/values/setup.xml
index 69abc641e47..833a3eb1868 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -38,9 +38,8 @@
     <color name="login_background_color">#FFFFFF</color>
     <color name="login_logo_background_color">#FFFFFF</color>
     <color name="background_color">#FFFFFF</color>
-    <color name="actionbar_start_color">#1D2D44</color>
-    <color name="actionbar_end_color">#1D2D44</color>
-    <color name="primary_button_background_color">@color/owncloud_blue_accent</color>
+    <color name="actionbar_start_color">@color/primary</color>
+    <color name="primary_button_background_color">@color/color_accent</color>
     <color name="primary_button_text_color">@color/white</color>
     <color name="secondary_button_background_color">#D6D7D7</color>
     <color name="secondary_button_text_color">@color/black</color>
@@ -50,7 +49,7 @@
     <color name="button_text_color">#000000</color>
 
     <!-- Multiselect backgrounds -->
-    <color name="action_mode_background">@color/owncloud_blue_accent</color>
+    <color name="action_mode_background">@color/primary_button_background_color</color>
     <color name="action_mode_status_bar_background">@color/actionbar_start_color</color>
 
     <!-- Multiaccount support -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87b5ad1852c..d59ae380bb5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -236,6 +236,7 @@
     <string name="confirmation_remove_file_alert">"Do you really want to remove %1$s?"</string>
     <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents?"</string>
     <string name="confirmation_remove_local">Local only</string>
+    <string name="confirmation_remove_account_alert">"Do you really want to remove the account %1$s?"</string>
     <string name="remove_success_msg">"Removal succeeded"</string>
     <string name="remove_fail_msg">"Removal failed"</string>
     <string name="rename_dialog_title">Enter a new name</string>
@@ -345,6 +346,7 @@
 
     <string name="prefs_category_accounts">Accounts</string>
     <string name="prefs_add_account">Add account</string>
+    <string name="drawer_manage_accounts">Manage accounts</string>
     <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
 
 	<string name="actionbar_logger">Logs</string>
diff --git a/res/values/strings__not_to_translate.xml b/res/values/strings__not_to_translate.xml
index 93f09f0943d..503cc549ec6 100644
--- a/res/values/strings__not_to_translate.xml
+++ b/res/values/strings__not_to_translate.xml
@@ -29,26 +29,6 @@
         <item>MOVE</item>
     </string-array>
 
-    <!-- Nav Drawer Menu Items -->
-    <string-array name="drawer_items">
-        <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
-        <!--<item>@string/prefs_accounts</item>-->
-        <item>@string/drawer_item_all_files</item>
-        <!--<item>@string/drawer_item_on_device</item>-->
-        <item>@string/drawer_item_uploads_list</item>
-        <item>@string/actionbar_settings</item>
-    </string-array>
-
-    <!-- Nav Drawer Content Descriptions -->
-    <string-array name="drawer_content_descriptions">
-        <!-- TODO re-enable when "Accounts" is available in Navigation Drawer-->
-        <!--<item>@string/drawer_item_accounts</item>-->
-        <item>@string/drawer_item_all_files</item>
-        <!--<item>@string/drawer_item_on_device</item>-->
-        <item>@string/drawer_item_uploads_list</item>
-        <item>@string/drawer_item_settings</item>
-    </string-array>
-
     <!-- Entries in dialog to choose sorting criteria -->
     <string-array name="actionbar_sort_by_options">
         <item>@string/actionbar_sort_by_name</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2a6716db1eb..32d95ac825d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,58 +20,94 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 	<style name="Animations" />
 
-	<!-- General ownCloud app style -->
+	<!-- THEMES: styles for whole APP or individual ACTIVITIES -->
+
+	<!-- General ownCloud app style.
+		 To apply directly only on Activities that cannot extend ToolbarActivity;
+		 otherwise, prefer Theme.ownCloud.Toolbar -->
 	<style name="Theme.ownCloud" parent="Theme.AppCompat.Light.DarkActionBar">
-    	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
-    	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+		<item name="android:windowBackground">@color/background_color</item>
+
+		<!-- theme for the app bar (both for old actionbar and new toolbar) -->
+		<item name="actionBarTheme">@style/ownCloud.Appbar</item>
+
+		<!-- properties for action mode -->
+		<item name="windowActionModeOverlay">true</item>
 		<item name="actionModeBackground">@color/action_mode_background</item>
-		<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+
+		<!-- colors, Material Design way -->
 		<item name="colorPrimary">@color/primary</item>
 		<item name="colorPrimaryDark">@color/primary_dark</item>
 		<item name="colorAccent">@color/color_accent</item>
-		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
-		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
-		<item name="android:windowBackground">@color/background_color</item>
+
+		<!-- default theme for alert dialogs -->
+		<item name="alertDialogTheme">@style/Theme.ownCloud.AlertDialog</item>
+
+		<!-- style for search view -->
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
 	</style>
 
-	<!-- seperate action bar style for activities without an action bar -->
-	<style name="Theme.ownCloud.noActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
+	<!-- Extends Theme.ownCloud to remove legacy ActionBar from the window and add, via layouts, a Toolbar -->
+	<style name="Theme.ownCloud.Toolbar">
 		<item name="windowNoTitle">true</item>
 		<item name="windowActionBar">false</item>
-		<item name="colorPrimary">@color/primary</item>
-		<item name="colorPrimaryDark">@color/primary_dark</item>
-		<item name="colorAccent">@color/color_accent</item>
-		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
-		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
-		<item name="android:windowBackground">@color/background_color</item>
-		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
-    </style>
+	</style>
 
-	<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
-		<item name="colorAccent">@color/white</item>
+	<!-- Extends Theme.ownCloud.Toolbar for Drawer activities including Drawwer; needed for v21+ theming -->
+	<style name="Theme.ownCloud.Toolbar.Drawer">
 	</style>
 
-	<style name="ownCloud.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
-		<item name="colorAccent">@color/color_accent</item>
-		<item name="android:textColorPrimary">@color/primary</item>
-		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
+	<!-- Extends Theme.ownCloud to make LEGACY ActionBar both OVERLAY and TRANSPARENT -->
+	<style name="Theme.ownCloud.Overlay" >
+		<item name="windowActionBarOverlay">true</item>
+		<item name="actionBarTheme">@style/ownCloud.Appbar.Transparent</item>
 	</style>
 
-	<style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog">
-		<item name="colorAccent">@color/color_accent</item>
-		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
+    <!-- Extends Theme.ownCloud for video in full screen mode -->
+    <style name="Theme.ownCloud.Fullscreen">
+        <item name="android:windowFullscreen">true</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowBackground">@android:color/background_dark</item>
+    </style>
+
+
+    <!-- DIALOG THEMES: styles for DIALOGs -->
+
+    <!-- DEFAULT (via Theme.ownCloud), and explicitly used ONCE, in Preference "behaviour" for instant uploads - NO MORE, not needed, it's default -->
+    <style name="Theme.ownCloud.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="android:textColorPrimary">@color/primary</item>
+        <item name="searchViewStyle">@style/ownCloud.SearchView</item>
+        <item name="buttonBarButtonStyle">@style/Theme.ownCloud.Dialog.ButtonBar.Button</item>
+        <item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
+    </style>
+
+    <!-- USED IN SHAREACTIVITY!! !! -->
+    <style name="Theme.ownCloud.AlertDialog.NoTitle" >
+        <item name="windowNoTitle">true</item>
+    </style>
+
+
+    <!-- APP BAR styles -->
+
+	<!-- Regular style for the app bar (both for old actionbar and new toolbar);
+	 	overrides colorPrimary to allow customization of the app bar color,
+	 	independent of Material Design guidelines, if desired
+	-->
+	<style name="ownCloud.Appbar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+		<item name="colorPrimary">@color/actionbar_start_color</item>
 	</style>
 
-	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
-		<item name="colorAccent">@color/color_accent</item>
-		<item name="android:textColorPrimary">@color/primary</item>
-		<item name="android:windowFrame">@color/transparent</item>
-		<item name="android:windowBackground">@color/transparent</item>
-		<item name="android:windowTitleBackgroundStyle">@drawable/process_dialog_background</item>
+	<!-- Transparent style for the app bar -->
+	<style name="ownCloud.Appbar.Transparent" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+		<item name="colorPrimary">@color/owncloud_blue_transparent</item>
 	</style>
 
-	<style name="ownCloud.SearchView" parent="Widget.AppCompat.SearchView">
+
+    <!-- MORE styles -->
+
+    <style name="ownCloud.SearchView" parent="Widget.AppCompat.SearchView">
 		<!-- Close button icon -->
 		<item name="closeIcon">@drawable/ic_close</item>
 		<!-- Search button icon -->
@@ -98,76 +134,32 @@
 		<item name="android:textColor">@color/color_accent</item>
 	</style>
 
-	<!-- separat translucent action bar style -->
-	<style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
-		<item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
-		<item name="windowActionBarOverlay">true</item>
-		<!-- Support library compatibility -->
-		<item name="actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
-	</style>
-
-	<!-- ACTION BAR STYLES -->
-	<style name="Theme.ownCloud.Overlay.ActionBar" parent="@style/Widget.AppCompat.ActionBar">
-		<item name="android:background">@color/owncloud_blue_transparent</item>
-		<item name="android:windowActionBarOverlay">true</item>
-
-		<!-- Support library compatibility -->
-		<item name="background">@color/owncloud_blue_transparent</item>
-		<item name="windowActionBarOverlay">true</item>
-	</style>
-
-	<!-- Progress bar -->
+	<!-- Style for top progress bar -->
 	<style name="Widget.ownCloud.TopProgressBar" parent="style/Widget.AppCompat.ProgressBar.Horizontal">
-		<item name="android:progressDrawable">@drawable/actionbar_progress_horizontal</item>
-		<item name="android:indeterminateDrawable">@drawable/actionbar_progress_indeterminate_horizontal</item>
-	</style>
-
-	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.AppCompat">
-        <item name="android:windowFullscreen">true</item>
-		<item name="colorAccent">@color/color_accent</item>
-    </style>
-	
-	
-	<style name="Theme.ownCloud.Widget.ActionBar"
-		parent="style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-    	<item name="android:background">@color/owncloud_blue</item>
-    	<item name="background">@drawable/main_header_bg</item>
-    	<item name="android:textColor">#ffffff</item>
-    	<item name="android:shadowColor">#222222</item>
-    	<item name="android:shadowRadius">1</item>
-    	<item name="android:shadowDy">1</item>
-    	<item name="android:backgroundSplit">@drawable/split_action_bg</item>
+		<!-- for a custom color independent of @color/primary,
+		change value of actionbar_start_color in setup.xml, don't modify here -->
+		<item name="android:background">@color/actionbar_start_color</item>
+		<item name="android:progressDrawable">@drawable/top_progress_bar_determinate</item>
+		<item name="android:indeterminateDrawable">@drawable/top_progress_bar_indeterminate</item>
 	</style>
 
 	<!-- Dialogs -->
-	<style name="Theme.ownCloud.Dialog" parent="style/Theme.AppCompat.Light.Dialog.Alert">
-		<item name="windowNoTitle">false</item>
-		<item name="colorAccent">@color/owncloud_blue_accent</item>
-		<item name="buttonBarButtonStyle">@style/Theme.ownCloud.Dialog.ButtonBar.Button</item>
-		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
-	</style>
-
-	<style name="Theme.ownCloud.Dialog.NoTitle" parent="style/Theme.ownCloud.Dialog">
-		<item name="windowNoTitle">true</item>
-		<item name="colorAccent">@color/owncloud_blue_accent</item>
-	</style>
-
-	<style name="Theme.ownCloud.Dialog.NoButtonBarStyle" parent="style/Theme.AppCompat.Light.Dialog.Alert">
-		<item name="windowNoTitle">false</item>
-		<item name="colorAccent">@color/owncloud_blue_accent</item>
-	</style>
-
 	<style name="menu_labels_style">
 		<item name="android:background">@drawable/fab_label_background</item>
 		<item name="android:textColor">@color/fab_white</item>
 	</style>
 
+	<style name="NavigationView_ItemTextAppearance">
+		<item name="android:ellipsize">end</item>
+		<item name="android:listDivider">@color/transparent</item>
+	</style>
+
 	<!-- Button Bar hack due to Lollipop bug:
 		https://code.google.com/p/android/issues/detail?id=78302
 	fix see:
 		http://stackoverflow.com/questions/27187353/dialog-buttons-with-long-text-not-wrapping-squeezed-out-material-theme-on-an
 	 -->
-	<style name="Theme.ownCloud.Dialog.ButtonBar" parent="style/Widget.AppCompat.Button.ButtonBar.AlertDialog">
+	<style name="Theme.ownCloud.Dialog.ButtonBar" parent="style/Widget.AppCompat.ButtonBar.AlertDialog">
 		<!-- Making sure, the button bar uses parent width and is not restricted in height -->
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>
@@ -177,7 +169,7 @@
 
 	<style name="Theme.ownCloud.Dialog.ButtonBar.Button" parent="style/Widget.AppCompat.Button.Borderless.Colored">
 		<!-- Setting the weight as follows should result in equally wide buttons filling the alert dialog width,
-            but instead they span further out of the dialog, breaking in multiple lines though -->
+			but instead they span further out of the dialog, breaking in multiple lines though -->
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_weight">1</item>
 		<!-- setting a fixed width as follows results in narrow buttons with line breaks, but of course this is not a solution -->
@@ -231,30 +223,28 @@
 	</style>
 	
 	<style name="PassCodeStyle">
-        <item name="android:layout_width">50dp</item>
-        <item name="android:layout_height">50dp</item>
-  		<item name="android:gravity">center</item>
-  		<item name="android:layout_margin">10dp</item>
-  		<item name="android:inputType">numberDecimal</item>
-  		<item name="android:numeric">decimal</item>
+		<item name="android:layout_width">50dp</item>
+		<item name="android:layout_height">50dp</item>
+		<item name="android:gravity">center</item>
+		<item name="android:layout_margin">10dp</item>
+		<item name="android:inputType">numberDecimal</item>
+		<item name="android:numeric">decimal</item>
 		<item name="android:digits">1234567890</item>
 		<item name="android:maxLength">1</item>
 		<item name="android:password">true</item>
 		<item name="android:singleLine">true</item>
-  		    
+	</style>
+
+    <!-- Notifications -->
+    <style 	name="Theme.ownCloud.NotificationText.Title"
+              parent="@android:style/TextAppearance.StatusBar.EventContent.Title" >
+        <item name="android:textSize">18sp</item>
+        <item name="android:textStyle">bold</item>
     </style>
-	
-	<style name="OAuthDialog" parent="style/Theme.AppCompat.Light.Dialog.Alert">
-		<item name="windowNoTitle">false</item>
-		<item name="colorAccent">@color/owncloud_blue_accent</item>
-	</style>    
-		
-	<color name="setup_text_hint">#777777</color>
-	<color name="setup_text_typed">#000000</color>
-    <style name="Theme.ownCloud.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
+
+    <style 	name="Theme.ownCloud.NotificationText.Content"
+              parent="@android:style/TextAppearance.StatusBar.EventContent"	>
+        <item name="android:textSize">16sp</item>
     </style>
-    <style name="Theme.ownCloud.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-    <style name="Theme.ownCloud.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>
\ No newline at end of file
diff --git a/res/values/versioned_styles.xml b/res/values/versioned_styles.xml
deleted file mode 100644
index 660e0fdc9fa..00000000000
--- a/res/values/versioned_styles.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<!-- DropDown -->
-	<style name="Theme.ownCloud.DropDownStyle"
-		parent="style/Widget.AppCompat.Spinner.DropDown.ActionBar">
-		<!--<item name="android:background">@drawable/spinner_inner</item>-->
-	</style>
-	
-	<style name="Theme.ownCloud.IndeterminateStyle"
-		parent="style/Widget.AppCompat.ProgressBar">
-	    <!--<item name="android:indeterminateDrawable">@drawable/abs__progress_medium_holo</item>-->
-	</style>
-
-	<!-- Notifications -->
-	<style 	name="Theme.ownCloud.NotificationText.Title" 
-	    	parent="@android:style/TextAppearance">
-        <item name="android:textColor">#ff000000</item>
-		<item name="android:textSize">18sp</item>
-        <item name="android:textStyle">bold</item>
-	</style>
-	<style 	name="Theme.ownCloud.NotificationText.Content" 
-	    	parent="@android:style/TextAppearance">
-        <item name="android:textColor">#ff000000</item>
-		<item name="android:textSize">14sp</item>
-	</style>
-</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 75ea3289e8a..a3309a59c6a 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -17,12 +17,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:title="@string/prefs_category_accounts"
-        android:key="accounts_category"
-        >
-    </PreferenceCategory>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <PreferenceCategory
         android:title="@string/prefs_category_instant_uploading"
diff --git a/src/com/owncloud/android/authentication/AccountUtils.java b/src/com/owncloud/android/authentication/AccountUtils.java
index 71e211f88f8..14220be79bf 100644
--- a/src/com/owncloud/android/authentication/AccountUtils.java
+++ b/src/com/owncloud/android/authentication/AccountUtils.java
@@ -110,6 +110,20 @@ public static boolean exists(Account account, Context context) {
         }
         return false;
     }
+
+    /**
+     * returns the user's name based on the account name.
+     *
+     * @param accountName the account name
+     * @return the user's name
+     */
+    public static String getUsernameOfAccount(String accountName) {
+        if (accountName != null) {
+            return accountName.substring(0, accountName.lastIndexOf("@"));
+        } else {
+            return null;
+        }
+    }
     
     /**
      * Returns owncloud account identified by accountName or null if it does not exist.
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index dd3b4b43ebf..fcfbbe2d8d0 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -89,7 +89,7 @@
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.dialog.CredentialsDialogFragment;
-import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
+import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
@@ -750,8 +750,7 @@ private void getOAuth2AccessTokenFromCapturedRedirection() {
         mNewCapturedUriFromOAuth2Redirection = null;
 
         /// Showing the dialog with instructions for the user.
-        IndeterminateProgressDialog dialog = 
-                IndeterminateProgressDialog.newInstance(R.string.auth_getting_authorization, true);
+        LoadingDialog dialog = LoadingDialog.newInstance(R.string.auth_getting_authorization, true);
         dialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);
 
         /// GET ACCESS TOKEN to the oAuth server
@@ -959,8 +958,7 @@ private void checkBasicAuthorization() {
         String password = mPasswordInput.getText().toString();
 
         /// be gentle with the user
-        IndeterminateProgressDialog dialog = 
-                IndeterminateProgressDialog.newInstance(R.string.auth_trying_to_login, true);
+        LoadingDialog dialog = LoadingDialog.newInstance(R.string.auth_trying_to_login, true);
         dialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);
 
         /// validate credentials accessing the root folder
@@ -1381,8 +1379,7 @@ private void onGetOAuthAccessTokenFinish(RemoteOperationResult result) {
 
         if (result.isSuccess()) {
             /// be gentle with the user
-            IndeterminateProgressDialog dialog = 
-                    IndeterminateProgressDialog.newInstance(R.string.auth_trying_to_login, true);
+            LoadingDialog dialog = LoadingDialog.newInstance(R.string.auth_trying_to_login, true);
             dialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);
 
             /// time to test the retrieved access token on the ownCloud server
diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index d5a583eec3a..83a242cd7d1 100644
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -21,13 +21,6 @@
 
 package com.owncloud.android.datamodel;
 
-import java.io.File;
-import java.io.InputStream;
-import java.lang.ref.WeakReference;
-
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
-
 import android.accounts.Account;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -35,11 +28,12 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.support.v4.content.ContextCompat;
+import android.view.MenuItem;
 import android.widget.ImageView;
 
 import com.owncloud.android.MainApp;
@@ -50,9 +44,16 @@
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
+import com.owncloud.android.ui.DefaultAvatarTextDrawable;
 import com.owncloud.android.ui.adapter.DiskLruImageCache;
 import com.owncloud.android.utils.BitmapUtils;
-import com.owncloud.android.utils.DisplayUtils;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.GetMethod;
+
+import java.io.File;
+import java.io.InputStream;
+import java.lang.ref.WeakReference;
 
 /**
  * Manager for concurrent access to thumbnails cache.
@@ -78,7 +79,7 @@ public class ThumbnailsCacheManager {
                     R.drawable.file_image
             );
 
-    
+
     public static class InitDiskCacheTask extends AsyncTask<File, Void, Void> {
 
         @Override
@@ -122,6 +123,14 @@ public static void addBitmapToCache(String key, Bitmap bitmap) {
         }
     }
 
+    public static void removeBitmapFromCache(String key) {
+        synchronized (mThumbnailsDiskCacheLock) {
+            if (mThumbnailCache != null) {
+                mThumbnailCache.removeKey(key);
+            }
+        }
+    }
+
 
     public static Bitmap getBitmapFromDiskCache(String key) {
         synchronized (mThumbnailsDiskCacheLock) {
@@ -150,7 +159,7 @@ public static class ThumbnailGenerationTask extends AsyncTask<Object, Void, Bitm
         public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager,
                                        Account account) {
             // Use a WeakReference to ensure the ImageView can be garbage collected
-            mImageViewReference = new WeakReference<ImageView>(imageView);
+            mImageViewReference = new WeakReference<>(imageView);
             if (storageManager == null)
                 throw new IllegalArgumentException("storageManager must not be NULL");
             mStorageManager = storageManager;
@@ -159,7 +168,7 @@ public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager stora
 
         public ThumbnailGenerationTask(ImageView imageView) {
             // Use a WeakReference to ensure the ImageView can be garbage collected
-            mImageViewReference = new WeakReference<ImageView>(imageView);
+            mImageViewReference = new WeakReference<>(imageView);
         }
 
         @Override
@@ -329,8 +338,7 @@ private Bitmap handlePNG(Bitmap bitmap, int px){
                     Bitmap.Config.ARGB_8888);
             Canvas c = new Canvas(resultBitmap);
 
-            c.drawColor(MainApp.getAppContext().getResources().
-                    getColor(R.color.background_color));
+            c.drawColor(ContextCompat.getColor(MainApp.getAppContext(), R.color.background_color));
             c.drawBitmap(bitmap, 0, 0, null);
 
             return resultBitmap;
@@ -361,7 +369,227 @@ private Bitmap doFileInBackground() {
 
     }
 
-    public static boolean cancelPotentialWork(Object file, ImageView imageView) {
+    /**
+     * Show the avatar corresponding to the received account in an {@link ImageView} ir {@link MenuItem}.
+     *
+     * The avatar is loaded if available in the cache and bound to the received UI element. The avatar is not
+     * fetched from the server if not available, unless the parameter 'fetchFromServer' is set to 'true'.
+     *
+     * If there is no avatar stored and cannot be fetched, a colored icon is generated with the first
+     * letter of the account username.
+     *
+     * If this is not possible either, a predefined user icon is bound instead.
+     */
+    public static class GetAvatarTask extends AsyncTask<Object, Void, Drawable> {
+        private final WeakReference<ImageView> mImageViewReference;
+        private final WeakReference<MenuItem> mMenuItemReference;
+        private Account mAccount;
+        private float mDisplayRadius;
+        private boolean mFetchFromServer;
+
+        private String mUsername;
+        private OwnCloudClient mClient;
+
+        /**
+         * Builds an instance to show the avatar corresponding to the received account in an {@link ImageView}.
+         *
+         * @param imageView         The {@link ImageView} to bind the avatar to.
+         * @param account           OC account which avatar will be shown.
+         * @param displayRadius     The radius of the circle where the avatar will be clipped into.
+         * @param fetchFromServer   When 'true', if there is no avatar stored in the cache, it's fetched from
+         *                          the server. When 'false', server is not accessed, the fallback avatar is
+         *                          generated instead. USE WITH CARE, probably to be removed in the future.
+         */
+        public GetAvatarTask(ImageView imageView, Account account, float displayRadius, boolean fetchFromServer){
+            if (account == null) {
+                throw new IllegalArgumentException("Received NULL account");
+            }
+            mMenuItemReference = null;
+            mImageViewReference = new WeakReference<>(imageView);
+            mAccount = account;
+            mDisplayRadius = displayRadius;
+            mFetchFromServer = fetchFromServer;
+        }
+
+        /**
+         * Builds an instance to show the avatar corresponding to the received account in an {@link MenuItem}.
+         *
+         * @param menuItem         The {@ImageView} to bind the avatar to.
+         * @param account           OC account which avatar will be shown.
+         * @param displayRadius     The radius of the circle where the avatar will be clipped into.
+         * @param fetchFromServer   When 'true', if there is no avatar stored in the cache, it's fetched from
+         *                          the server. When 'false', server is not accessed, the fallback avatar is
+         *                          generated instead. USE WITH CARE, probably to be removed in the future.
+         */
+        public GetAvatarTask(MenuItem menuItem, Account account, float displayRadius, boolean fetchFromServer) {
+            if (account == null) {
+                throw new IllegalArgumentException("Received NULL account");
+            }
+            mImageViewReference = null;
+            mMenuItemReference = new WeakReference<>(menuItem);
+            mAccount = account;
+            mDisplayRadius = displayRadius;
+            mFetchFromServer = fetchFromServer;
+        }
+
+        @Override
+        protected Drawable doInBackground(Object... params) {
+            Drawable thumbnail = null;
+
+            try {
+                OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount,
+                        MainApp.getAppContext());
+                mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                        getClientFor(ocAccount, MainApp.getAppContext());
+
+                mUsername = mAccount.name;
+                thumbnail = doAvatarInBackground();
+
+            } catch(Throwable t){
+                // the app should never break due to a problem with avatars
+                Log_OC.e(TAG, "Generation of avatar for " + mUsername + " failed", t);
+                if (t instanceof OutOfMemoryError) {
+                    System.gc();
+                }
+            }
+
+            return thumbnail;
+        }
+
+        @Override
+        protected void onPostExecute(Drawable avatar) {
+            if (mImageViewReference != null) {
+                ImageView imageView = mImageViewReference.get();
+                if (imageView != null) {
+                    if (avatar != null) {
+                        imageView.setImageDrawable(avatar);
+                    } else {
+                        // really needed?
+                        imageView.setImageResource(
+                            R.drawable.ic_account_circle
+                        );
+                    }
+                }
+            } else if (mMenuItemReference != null) {
+                MenuItem menuItem = mMenuItemReference.get();
+                if (menuItem != null) {
+                    if (avatar != null) {
+                        menuItem.setIcon(avatar);
+                    } else {
+                        // really needed
+                        menuItem.setIcon(
+                            R.drawable.ic_account_circle
+                        );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Converts size of file icon from dp to pixel
+         * @return int
+         */
+        private int getAvatarDimension(){
+            // Converts dp to pixel
+            Resources r = MainApp.getAppContext().getResources();
+            return Math.round(r.getDimension(R.dimen.file_avatar_size));
+        }
+
+        private Drawable doAvatarInBackground() {
+
+            Drawable avatarDrawable = null;
+
+            final String imageKey = "a_" + mUsername;
+
+            // Check disk cache in background thread
+            Bitmap avatarBitmap = getBitmapFromDiskCache(imageKey);
+
+            if (avatarBitmap != null) {
+                avatarDrawable =  BitmapUtils.bitmapToCircularBitmapDrawable(
+                    MainApp.getAppContext().getResources(),
+                    avatarBitmap
+                );
+
+            } else {
+                // Not found in disk cache
+                if (mFetchFromServer) {
+                    int px = getAvatarDimension();
+
+                    // Download avatar from server
+                    OwnCloudVersion serverOCVersion = AccountUtils.getServerVersion(mAccount);
+                    if (mClient != null && serverOCVersion != null) {
+                        if (serverOCVersion.supportsRemoteThumbnails()) {
+                            GetMethod get = null;
+                            try {
+                                String uri = mClient.getBaseUri() + "" +
+                                    "/index.php/avatar/" + AccountUtils.getUsernameOfAccount(mUsername) + "/" + px;
+                                Log_OC.d("Avatar", "URI: " + uri);
+                                get = new GetMethod(uri);
+                                int status = mClient.executeMethod(get);
+                                if (status == HttpStatus.SC_OK) {
+                                    InputStream inputStream = get.getResponseBodyAsStream();
+                                    Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
+                                    avatarBitmap = ThumbnailUtils.extractThumbnail(bitmap, px, px);
+
+                                    // Add avatar to cache
+                                    if (avatarBitmap != null) {
+                                        addBitmapToCache(imageKey, avatarBitmap);
+                                    }
+                                } else {
+                                    mClient.exhaustResponse(get.getResponseBodyAsStream());
+                                }
+                            } catch (Exception e) {
+                                Log_OC.e(TAG, "Error downloading avatar", e);
+                            } finally {
+                                if (get != null) {
+                                    get.releaseConnection();
+                                }
+                            }
+                        } else {
+                            Log_OC.d(TAG, "Server too old");
+                        }
+                    }
+                }
+                if (avatarBitmap != null) {
+                    avatarDrawable = BitmapUtils.bitmapToCircularBitmapDrawable(
+                        MainApp.getAppContext().getResources(),
+                        avatarBitmap
+                    );
+
+                } else {
+                    // generate placeholder from user name
+                    try {
+                        avatarDrawable = DefaultAvatarTextDrawable.createAvatar(mUsername, mDisplayRadius);
+
+                    } catch (Exception e) {
+                        // nothing to do, return null to apply default icon
+                        Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e);
+                    }
+                }
+            }
+            return avatarDrawable;
+        }
+
+    }
+
+    public static String addAvatarToCache(String accountName, byte[] avatarData, int dimension) {
+        final String imageKey = "a_" + accountName;
+
+        Bitmap bitmap = BitmapFactory.decodeByteArray(avatarData, 0, avatarData.length);
+        bitmap = ThumbnailUtils.extractThumbnail(bitmap, dimension, dimension);
+        // Add avatar to cache
+        if (bitmap != null) {
+            addBitmapToCache(imageKey, bitmap);
+        }
+        return imageKey;
+    }
+
+    public static void removeAvatarFromCache(String accountName) {
+        final String imageKey = "a_" + accountName;
+        removeBitmapFromCache(imageKey);
+    }
+
+    public static boolean cancelPotentialThumbnailWork(Object file, ImageView imageView) {
         final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
 
         if (bitmapWorkerTask != null) {
@@ -380,21 +608,81 @@ public static boolean cancelPotentialWork(Object file, ImageView imageView) {
         return true;
     }
 
-    public static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) {
+    public static boolean cancelPotentialAvatarWork(Object file, ImageView imageView) {
+        final GetAvatarTask avatarWorkerTask = getAvatarWorkerTask(imageView);
+
+        if (avatarWorkerTask != null) {
+            final Object usernameData = avatarWorkerTask.mUsername;
+            // If usernameData is not yet set or it differs from the new data
+            if (usernameData == null || usernameData != file) {
+                // Cancel previous task
+                avatarWorkerTask.cancel(true);
+                Log_OC.v(TAG, "Cancelled generation of avatar for a reused imageView");
+            } else {
+                // The same work is already in progress
+                return false;
+            }
+        }
+        // No task associated with the ImageView, or an existing task was cancelled
+        return true;
+    }
+
+    public static boolean cancelPotentialAvatarWork(Object file, MenuItem menuItem) {
+        final GetAvatarTask avatarWorkerTask = getAvatarWorkerTask(menuItem);
+
+        if (avatarWorkerTask != null) {
+            final Object usernameData = avatarWorkerTask.mUsername;
+            // If usernameData is not yet set or it differs from the new data
+            if (usernameData == null || usernameData != file) {
+                // Cancel previous task
+                avatarWorkerTask.cancel(true);
+                Log_OC.v(TAG, "Cancelled generation of avatar for a reused imageView");
+            } else {
+                // The same work is already in progress
+                return false;
+            }
+        }
+        // No task associated with the ImageView, or an existing task was cancelled
+        return true;
+    }
+
+    private static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) {
         if (imageView != null) {
             final Drawable drawable = imageView.getDrawable();
-            if (drawable instanceof AsyncDrawable) {
-                final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
+            if (drawable instanceof AsyncThumbnailDrawable) {
+                final AsyncThumbnailDrawable asyncDrawable = (AsyncThumbnailDrawable) drawable;
                 return asyncDrawable.getBitmapWorkerTask();
             }
         }
         return null;
     }
 
-    public static class AsyncDrawable extends BitmapDrawable {
+    private static GetAvatarTask getAvatarWorkerTask(ImageView imageView) {
+        if (imageView != null) {
+            return getAvatarWorkerTask(imageView.getDrawable());
+        }
+        return null;
+    }
+
+    private static GetAvatarTask getAvatarWorkerTask(MenuItem menuItem) {
+        if (menuItem != null) {
+            return getAvatarWorkerTask(menuItem.getIcon());
+        }
+        return null;
+    }
+
+    private static GetAvatarTask getAvatarWorkerTask(Drawable drawable) {
+        if (drawable instanceof AsyncAvatarDrawable) {
+            final AsyncAvatarDrawable asyncDrawable = (AsyncAvatarDrawable) drawable;
+            return asyncDrawable.getAvatarWorkerTask();
+        }
+        return null;
+    }
+
+    public static class AsyncThumbnailDrawable extends BitmapDrawable {
         private final WeakReference<ThumbnailGenerationTask> bitmapWorkerTaskReference;
 
-        public AsyncDrawable(
+        public AsyncThumbnailDrawable(
                 Resources res, Bitmap bitmap, ThumbnailGenerationTask bitmapWorkerTask
         ) {
 
@@ -407,4 +695,21 @@ public ThumbnailGenerationTask getBitmapWorkerTask() {
             return bitmapWorkerTaskReference.get();
         }
     }
+
+    public static class AsyncAvatarDrawable extends BitmapDrawable {
+        private final WeakReference<GetAvatarTask> avatarWorkerTaskReference;
+
+        public AsyncAvatarDrawable(
+                Resources res, Bitmap bitmap, GetAvatarTask avatarWorkerTask
+        ) {
+
+            super(res, bitmap);
+            avatarWorkerTaskReference =
+                    new WeakReference<GetAvatarTask>(avatarWorkerTask);
+        }
+
+        public GetAvatarTask getAvatarWorkerTask() {
+            return avatarWorkerTaskReference.get();
+        }
+    }
 }
diff --git a/src/com/owncloud/android/datamodel/UserProfile.java b/src/com/owncloud/android/datamodel/UserProfile.java
new file mode 100644
index 00000000000..2f0324c4364
--- /dev/null
+++ b/src/com/owncloud/android/datamodel/UserProfile.java
@@ -0,0 +1,93 @@
+package com.owncloud.android.datamodel;
+
+import android.support.annotation.Nullable;
+
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+public class UserProfile {
+
+    private long mId;
+    private String mAccountName;
+
+    private String mUserId;
+    private String mDisplayName = "";
+    private String mEmail = "";
+
+    private UserAvatar mAvatar;
+
+    public UserProfile(String accountName, String userId, String displayName, String email) {
+        mAccountName = accountName;
+        mUserId = userId;
+        mDisplayName = displayName;
+        mEmail = email;
+
+        mAvatar = null;
+    }
+
+    public String getAccountName() {
+        return mAccountName;
+    }
+
+    public String getUserId() {
+        return mUserId;
+    }
+
+    public String getDisplayName() {
+        return mDisplayName;
+    }
+
+    public String getEmail() {
+        return mEmail;
+    }
+
+    @Nullable
+    public UserAvatar getAvatar() {
+        return mAvatar;
+    }
+
+    public void setAvatar(UserAvatar avatar) {
+        mAvatar = avatar;
+    }
+
+    public static class UserAvatar {
+
+        private String mCacheKey;
+        private String mMimeType;
+        private String mEtag;
+
+        public UserAvatar(String cacheKey, String mimeType, String etag) {
+            mCacheKey = cacheKey;
+            mMimeType = mimeType;
+            mEtag = etag;
+        }
+
+        public String getCacheKey() {
+            return mCacheKey;
+        }
+
+        public String getMimeType() {
+            return mMimeType;
+        }
+
+        public String getEtag() {
+            return mEtag;
+        }
+    }
+}
diff --git a/src/com/owncloud/android/datamodel/UserProfilesRepository.java b/src/com/owncloud/android/datamodel/UserProfilesRepository.java
new file mode 100644
index 00000000000..4dbbd6899b3
--- /dev/null
+++ b/src/com/owncloud/android/datamodel/UserProfilesRepository.java
@@ -0,0 +1,194 @@
+package com.owncloud.android.datamodel;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import com.owncloud.android.MainApp;
+import com.owncloud.android.db.ProviderMeta;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import java.io.File;
+
+/**
+ *   ownCloud Android client application
+ *
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Minimum to get things working.
+ *
+ * Working around FileContentProvider, we have no interest in exporting user profiles to other apps.
+ */
+public class UserProfilesRepository {
+
+    private static final String TAG = UserProfilesRepository.class.getName();
+
+    private SQLiteDatabase mDb;
+
+    public UserProfilesRepository() {
+        File dbFile = MainApp.getAppContext().getDatabasePath(ProviderMeta.DB_NAME);
+        mDb = SQLiteDatabase.openDatabase(
+            dbFile.getAbsolutePath(),
+            null,
+            SQLiteDatabase.OPEN_READWRITE
+        );
+    }
+
+    /**
+     * Persist a user profile.
+     *
+     * Minimum to get things working: only storing info about avatar.
+     *
+     * Working around ContentProvider
+     *
+     * @param userProfile           User profile.
+     */
+    public void update(UserProfile userProfile) {
+
+        if (userProfile == null) {
+            throw new IllegalArgumentException("Received userProfile with NULL value");
+        }
+
+        if (userProfile.getAvatar() != null) {
+            // map avatar properties to columns
+            ContentValues avatarValues = new ContentValues();
+            avatarValues.put(
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__ACCOUNT_NAME,
+                userProfile.getAccountName()
+            );
+            avatarValues.put(
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__CACHE_KEY,
+                userProfile.getAvatar().getCacheKey()
+            );
+            avatarValues.put(
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__ETAG,
+                userProfile.getAvatar().getEtag()
+            );
+            avatarValues.put(
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__MIME_TYPE,
+                userProfile.getAvatar().getMimeType()
+            );
+
+            mDb.beginTransaction();
+            try {
+                if (avatarExists(userProfile)) {
+                    // not new, UPDATE
+                    int count = mDb.update(
+                        ProviderMeta.ProviderTableMeta.USER_AVATARS__TABLE_NAME,
+                        avatarValues,
+                        ProviderMeta.ProviderTableMeta.USER_AVATARS__ACCOUNT_NAME + "=?",
+                        new String[]{String.valueOf(userProfile.getAccountName())}
+                    );
+                    Log_OC.d(TAG, "Avatar updated");
+
+                } else {
+                    // new, CREATE
+                    mDb.insert(
+                        ProviderMeta.ProviderTableMeta.USER_AVATARS__TABLE_NAME,
+                        null,
+                        avatarValues
+                    );
+                    Log_OC.d(TAG, "Avatar inserted");
+                }
+                mDb.setTransactionSuccessful();
+
+            } finally {
+                mDb.endTransaction();
+            }
+        }
+    }
+
+    /**
+     * Gets the information about a user avatar bound to an OC account.
+     *
+     * Shortcut method prevent retrieving a full {@link UserProfile},
+     * specially now that {@link UserProfile}s are not really stored. Naughty trick.
+     *
+     * @param   accountName         Name of an OC account.
+     * @return                      Information about a user avatar bound to an OC account, or NULL if
+     *                              there is no avatar for the given account.
+     */
+    public UserProfile.UserAvatar getAvatar(String accountName) {
+        UserProfile.UserAvatar avatar = null;
+        Cursor c = null;
+        try {
+             c = mDb.query(
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__TABLE_NAME,
+                null,
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__ACCOUNT_NAME + "=?",
+                new String[]{accountName},
+                null, null, null
+            );
+            if (c != null && c.moveToFirst()) {
+                avatar = new UserProfile.UserAvatar(
+                    c.getString(c.getColumnIndex(
+                        ProviderMeta.ProviderTableMeta.USER_AVATARS__CACHE_KEY
+                    )),
+                    c.getString(c.getColumnIndex(
+                        ProviderMeta.ProviderTableMeta.USER_AVATARS__MIME_TYPE
+                    )),
+                    c.getString(
+                        c.getColumnIndex(ProviderMeta.ProviderTableMeta.USER_AVATARS__ETAG
+                    ))
+                );
+            }   // else, no avatar to return
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Exception while querying avatar", e);
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+        return avatar;
+    }
+
+    public void deleteAvatar(String accountName) {
+        try {
+            mDb.delete(
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__TABLE_NAME,
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__ACCOUNT_NAME + "=?",
+                new String[]{String.valueOf(accountName)}
+            );
+            Log_OC.d(TAG, "Avatar deleted");
+
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Exception while deleting avatar", e);
+        }
+    }
+
+    private boolean avatarExists(UserProfile userProfile) {
+        boolean exists = false;
+        Cursor c = null;
+        try {
+            c = mDb.query(
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__TABLE_NAME,
+                null,
+                ProviderMeta.ProviderTableMeta.USER_AVATARS__ACCOUNT_NAME + "=?",
+                new String[]{userProfile.getAccountName()},
+                null, null, null
+            );
+            exists = (c != null && c.moveToFirst());
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+        return exists;
+    }
+
+}
diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java
index e7cc5329a34..cfce7ce9456 100644
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/com/owncloud/android/db/ProviderMeta.java
@@ -33,7 +33,7 @@
 public class ProviderMeta {
 
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 14;
+    public static final int DB_VERSION = 15;
 
     private ProviderMeta() {
     }
@@ -43,6 +43,8 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String OCSHARES_TABLE_NAME = "ocshares";
         public static final String CAPABILITIES_TABLE_NAME = "capabilities";
         public static final String UPLOADS_TABLE_NAME = "list_of_uploads";
+        public static final String USER_AVATARS__TABLE_NAME = "user_avatars";
+
         public static final Uri CONTENT_URI = Uri.parse("content://"
                 + MainApp.getAuthority() + "/");
         public static final Uri CONTENT_URI_FILE = Uri.parse("content://"
@@ -151,5 +153,11 @@ static public class ProviderTableMeta implements BaseColumns {
 
         public static final String UPLOADS_DEFAULT_SORT_ORDER = ProviderTableMeta._ID  + " collate nocase desc";
 
+
+        // Columns of user_avatars table
+        public static final String USER_AVATARS__ACCOUNT_NAME = "account_name";
+        public static final String USER_AVATARS__CACHE_KEY = "cache_key";
+        public static final String USER_AVATARS__ETAG = "etag";
+        public static final String USER_AVATARS__MIME_TYPE = "mime_type";
     }
 }
diff --git a/src/com/owncloud/android/operations/GetUserProfileOperation.java b/src/com/owncloud/android/operations/GetUserProfileOperation.java
index 0ece675254e..e5985093b71 100644
--- a/src/com/owncloud/android/operations/GetUserProfileOperation.java
+++ b/src/com/owncloud/android/operations/GetUserProfileOperation.java
@@ -21,15 +21,24 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.content.res.Resources;
 
 import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.ThumbnailsCacheManager;
+import com.owncloud.android.datamodel.UserProfile;
+import com.owncloud.android.datamodel.UserProfilesRepository;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.users.GetRemoteUserAvatarOperation;
 import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation;
 import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation.UserInfo;
 import com.owncloud.android.operations.common.SyncOperation;
 
+import java.util.ArrayList;
+
 /**
  * Get and save user's profile from the server.
  *
@@ -37,6 +46,9 @@
  */
 public class GetUserProfileOperation extends SyncOperation {
 
+    private static final String TAG = GetUserProfileOperation.class.getName();
+
+
     /**
      * Performs the operation.
      *
@@ -51,22 +63,110 @@ public class GetUserProfileOperation extends SyncOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
 
-        // get display name
-        GetRemoteUserInfoOperation getDisplayName = new GetRemoteUserInfoOperation();
-        RemoteOperationResult result = getDisplayName.execute(client);
-
-        if (result.isSuccess()) {
-            // store display name with account data
-            AccountManager accountManager = AccountManager.get(MainApp.getAppContext());
-            UserInfo userInfo = (UserInfo) result.getData().get(0);
-            Account storedAccount = getStorageManager().getAccount();
-            accountManager.setUserData(
-                storedAccount,
-                AccountUtils.Constants.KEY_DISPLAY_NAME,
-                userInfo.mDisplayName
-            );
+        UserProfile userProfile = null;
+        RemoteOperationResult result = null;
+
+        try {
+            /// get display name
+            GetRemoteUserInfoOperation getDisplayName = new GetRemoteUserInfoOperation();
+            RemoteOperationResult remoteResult = getDisplayName.execute(client);
+            if (remoteResult.isSuccess()) {
+                // store display name with account data
+                AccountManager accountManager = AccountManager.get(MainApp.getAppContext());
+                UserInfo userInfo = (UserInfo) remoteResult.getData().get(0);
+                Account storedAccount = getStorageManager().getAccount();
+                accountManager.setUserData(
+                    storedAccount,
+                    AccountUtils.Constants.KEY_DISPLAY_NAME,    // keep also there, for the moment
+                    userInfo.mDisplayName
+                );
+
+                // map user info into UserProfile instance
+                userProfile = new UserProfile(
+                    storedAccount.name,
+                    userInfo.mId,
+                    userInfo.mDisplayName,
+                    userInfo.mEmail
+                );
+
+                /// get avatar (optional for success)
+                int dimension = getAvatarDimension();
+                UserProfile.UserAvatar currentUserAvatar =
+                    getUserProfilesRepository().getAvatar(storedAccount.name);
+                GetRemoteUserAvatarOperation getAvatarOperation = new GetRemoteUserAvatarOperation(
+                    dimension,
+                    (currentUserAvatar == null) ? "" : currentUserAvatar.getEtag()
+                );
+                remoteResult = getAvatarOperation.execute(client);
+                if (remoteResult.isSuccess()) {
+                    GetRemoteUserAvatarOperation.ResultData avatar =
+                        (GetRemoteUserAvatarOperation.ResultData) remoteResult.getData().get(0);
+
+                    //
+                    byte[] avatarData = avatar.getAvatarData();
+                    String avatarKey = ThumbnailsCacheManager.addAvatarToCache(
+                        storedAccount.name,
+                        avatarData,
+                        dimension
+                    );
+
+                    UserProfile.UserAvatar userAvatar = new UserProfile.UserAvatar(
+                        avatarKey, avatar.getMimeType(), avatar.getEtag()
+                    );
+                    userProfile.setAvatar(userAvatar);
+
+                } else if (remoteResult.getCode().equals(
+                    RemoteOperationResult.ResultCode.FILE_NOT_FOUND
+                )) {
+                    Log_OC.i(TAG, "No avatar available, removing cached copy");
+                    getUserProfilesRepository().deleteAvatar(storedAccount.name);
+                    ThumbnailsCacheManager.removeAvatarFromCache(storedAccount.name);
+
+                }   // others are ignored, including 304 (not modified), so the avatar is only stored
+                    // if changed in the server :D
+
+                /// store userProfile
+                getUserProfilesRepository().update(userProfile);
+
+                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.OK);
+                ArrayList<Object> data = new ArrayList<>();
+                data.add(userProfile);
+                result.setData(data);
+
+            } else {
+                result = remoteResult;
+            }
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Exception while getting user profile: ", e);
+            result = new RemoteOperationResult(e);
         }
+
         return result;
     }
 
+    /**
+     * Converts size of file icon from dp to pixel
+     * @return int
+     */
+    private int getAvatarDimension(){
+        // Converts dp to pixel
+        Resources r = MainApp.getAppContext().getResources();
+        return Math.round(r.getDimension(R.dimen.file_avatar_size));
+    }
+
+
+    /**
+     * Really bad place to have this. Only here to prevent go further with refactoring.
+     *
+     * @return  Reference to a {@link UserProfilesRepository}.
+     */
+    private static UserProfilesRepository getUserProfilesRepository() {
+        if (sUserProfilesRepository == null) {
+            sUserProfilesRepository = new UserProfilesRepository();
+        }
+        return sUserProfilesRepository;
+    }
+
+    private static UserProfilesRepository sUserProfilesRepository;
+
 }
diff --git a/src/com/owncloud/android/operations/RefreshFolderOperation.java b/src/com/owncloud/android/operations/RefreshFolderOperation.java
index 0669b8eb874..bd76b843f09 100644
--- a/src/com/owncloud/android/operations/RefreshFolderOperation.java
+++ b/src/com/owncloud/android/operations/RefreshFolderOperation.java
@@ -144,10 +144,10 @@ public RefreshFolderOperation(OCFile folder,
         mStorageManager = dataStorageManager;
         mAccount = account;
         mContext = context;
-        mForgottenLocalFiles = new HashMap<String, String>();
+        mForgottenLocalFiles = new HashMap<>();
         mRemoteFolderChanged = false;
         mIgnoreETag = ignoreETag;
-        mFilesToSyncContents = new Vector<SynchronizeFileOperation>();
+        mFilesToSyncContents = new Vector<>();
     }
     
     
@@ -180,7 +180,7 @@ public List<OCFile> getChildren() {
      */
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
+        RemoteOperationResult result;
         mFailsInFavouritesFound = 0;
         mConflictsFound = 0;
         mForgottenLocalFiles.clear();
@@ -247,7 +247,7 @@ private void updateUserProfile() {
         if (!result.isSuccess()) {
             Log_OC.w(TAG, "Couldn't update user profile from server");
         } else {
-            Log_OC.i(TAG, "Got display name: " + result.getData().get(0));
+            Log_OC.i(TAG, "Got user profile");
         }
     }
 
@@ -261,7 +261,7 @@ private void updateCapabilities(){
 
     private RemoteOperationResult checkForChanges(OwnCloudClient client) {
         mRemoteFolderChanged = true;
-        RemoteOperationResult result = null;
+        RemoteOperationResult result;
         String remotePath = mLocalFolder.getRemotePath();
 
         Log_OC.d(TAG, "Checking changes in " + mAccount.name + remotePath);
@@ -459,7 +459,7 @@ private void synchronizeData(ArrayList<Object> folderAndFiles, OwnCloudClient cl
     private void startContentSynchronizations(
             List<SynchronizeFileOperation> filesToSyncContents, OwnCloudClient client
         ) {
-        RemoteOperationResult contentsResult = null;
+        RemoteOperationResult contentsResult;
         for (SynchronizeFileOperation op: filesToSyncContents) {
             contentsResult = op.execute(mStorageManager, mContext);   // async
             if (!contentsResult.isSuccess()) {
@@ -488,7 +488,7 @@ private void startContentSynchronizations(
      *                  the operation.
      */
     private RemoteOperationResult refreshSharesForFolder(OwnCloudClient client) {
-        RemoteOperationResult result = null;
+        RemoteOperationResult result;
         
         // remote request 
         GetRemoteSharesForFileOperation operation = 
@@ -497,7 +497,7 @@ private RemoteOperationResult refreshSharesForFolder(OwnCloudClient client) {
         
         if (result.isSuccess()) {
             // update local database
-            ArrayList<OCShare> shares = new ArrayList<OCShare>();
+            ArrayList<OCShare> shares = new ArrayList<>();
             for(Object obj: result.getData()) {
                 shares.add((OCShare) obj);
             }
@@ -515,7 +515,6 @@ private RemoteOperationResult refreshSharesForFolder(OwnCloudClient client) {
      * @param event
      * @param dirRemotePath     Remote path of a folder that was just synchronized 
      *                          (with or without success)
-     * @param result
      */
     private void sendLocalBroadcast(
             String event, String dirRemotePath, RemoteOperationResult result
diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index ef2ce0063d5..0320c1a4464 100644
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -534,6 +534,8 @@ public void onCreate(SQLiteDatabase db) {
             // Create uploads table
             createUploadsTable(db);
 
+            // Create user profiles table
+            createUserProfilesTable(db);
         }
 
         @Override
@@ -763,6 +765,19 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                 }
             }
 
+            if (oldVersion < 15 && newVersion >= 15) {
+                Log_OC.i("SQL", "Entering in the #15 ADD in onUpgrade");
+                db.beginTransaction();
+                try {
+                    // Create user profiles table
+                    createUserProfilesTable(db);
+                    upgraded = true;
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+            }
+
             if (!upgraded)
                 Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion +
                         ", newVersion == " + newVersion);
@@ -863,18 +878,20 @@ private void createUploadsTable(SQLiteDatabase db){
                 + ProviderTableMeta.UPLOADS_LAST_RESULT + " INTEGER, "     // Upload LastResult
                 + ProviderTableMeta.UPLOADS_CREATED_BY + " INTEGER );"    // Upload createdBy
         );
+    }
 
-
-        /* before:
-        // PRIMARY KEY should always imply NOT NULL. Unfortunately, due to a
-        // bug in some early versions, this is not the case in SQLite.
-        //db.execSQL("CREATE TABLE " + TABLE_UPLOAD + " (" + " path TEXT PRIMARY KEY NOT NULL UNIQUE,"
-        //        + " uploadStatus INTEGER NOT NULL, uploadObject TEXT NOT NULL);");
-        // uploadStatus is used to easy filtering, it has precedence over
-        // uploadObject.getUploadStatus()
-        */
+    private void createUserProfilesTable(SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE " + ProviderTableMeta.USER_AVATARS__TABLE_NAME + "("
+            + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "
+            + ProviderTableMeta.USER_AVATARS__ACCOUNT_NAME + " TEXT, "
+            + ProviderTableMeta.USER_AVATARS__CACHE_KEY + " TEXT, "
+            + ProviderTableMeta.USER_AVATARS__MIME_TYPE + " TEXT, "
+            + ProviderTableMeta.USER_AVATARS__ETAG + " TEXT );"
+        );
     }
 
+
+
     /**
      * Version 10 of database does not modify its scheme. It coincides with the upgrade of the ownCloud account names
      * structure to include in it the path to the server instance. Updating the account names and path to local files
diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java
index da448bdc690..03e404134e1 100644
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -108,6 +108,7 @@ public class OperationsService extends Service {
     public static final String ACTION_GET_SERVER_INFO = "GET_SERVER_INFO";
     public static final String ACTION_OAUTH2_GET_ACCESS_TOKEN = "OAUTH2_GET_ACCESS_TOKEN";
     public static final String ACTION_GET_USER_NAME = "GET_USER_NAME";
+    public static final String ACTION_GET_USER_AVATAR = "GET_USER_AVATAR";
     public static final String ACTION_RENAME = "RENAME";
     public static final String ACTION_REMOVE = "REMOVE";
     public static final String ACTION_CREATE_FOLDER = "CREATE_FOLDER";
diff --git a/src/com/owncloud/android/ui/DefaultAvatarTextDrawable.java b/src/com/owncloud/android/ui/DefaultAvatarTextDrawable.java
new file mode 100644
index 00000000000..28480214f36
--- /dev/null
+++ b/src/com/owncloud/android/ui/DefaultAvatarTextDrawable.java
@@ -0,0 +1,130 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Andy Scherzinger
+ * @author Tobias Kaminsiky
+ * Copyright (C) 2016 ownCloud GmbH.
+ * <p/>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ * <p/>
+ * This program 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.
+ * <p/>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.ui;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+
+import com.owncloud.android.utils.BitmapUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * A Drawable object that draws text (1 character) on top of a circular/filled background.
+ */
+public class DefaultAvatarTextDrawable extends Drawable {
+    /**
+     * the text to be rendered.
+     */
+    private String mText;
+
+    /**
+     * the text paint to be rendered.
+     */
+    private Paint mTextPaint;
+
+    /**
+     * the background to be rendered.
+     */
+    private Paint mBackground;
+
+    /**
+     * the radius of the circular background to be rendered.
+     */
+    private float mRadius;
+
+    /**
+     * Create a DefaultAvatarTextDrawable with the given radius.
+     *
+     * @param text   the text to be rendered
+     * @param r      rgb red value
+     * @param g      rgb green value
+     * @param b      rgb blue value
+     * @param radius circle radius
+     */
+    public DefaultAvatarTextDrawable(String text, int r, int g, int b, float radius) {
+        mRadius = radius;
+        mText = text;
+
+        mBackground = new Paint();
+        mBackground.setStyle(Paint.Style.FILL);
+        mBackground.setAntiAlias(true);
+        mBackground.setColor(Color.rgb(r, g, b));
+
+        mTextPaint = new Paint();
+        mTextPaint.setColor(Color.WHITE);
+        mTextPaint.setTextSize(radius);
+        mTextPaint.setAntiAlias(true);
+        mTextPaint.setTextAlign(Paint.Align.CENTER);
+    }
+
+    /**
+     * creates an avatar in form of  a DefaultAvatarTextDrawable with the first letter of the account name in a circle with the
+     * given radius.
+     *
+     * @param accountName the account name
+     * @param radiusInDp  the circle's radius
+     * @return the avatar as a DefaultAvatarTextDrawable
+     * @throws UnsupportedEncodingException if the charset is not supported when calculating the color values
+     * @throws NoSuchAlgorithmException if the specified algorithm is not available when calculating the color values
+     */
+    @NonNull
+    public static DefaultAvatarTextDrawable createAvatar(String accountName, float radiusInDp) throws
+            UnsupportedEncodingException, NoSuchAlgorithmException {
+        int[] rgb = BitmapUtils.calculateAvatarBackgroundRGB(accountName);
+        DefaultAvatarTextDrawable avatar = new DefaultAvatarTextDrawable(
+                accountName.substring(0, 1).toUpperCase(), rgb[0], rgb[1], rgb[2], radiusInDp);
+        return avatar;
+    }
+
+    /**
+     * Draw in its bounds (set via setBounds) respecting optional effects such as alpha (set via setAlpha) and color
+     * filter (set via setColorFilter) a circular background with a user's first character.
+     *
+     * @param canvas The canvas to draw into
+     */
+    @Override
+    public void draw(Canvas canvas) {
+        canvas.drawCircle(mRadius, mRadius, mRadius, mBackground);
+        canvas.drawText(mText, mRadius, mRadius - ((mTextPaint.descent() + mTextPaint.ascent()) / 2), mTextPaint);
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        mTextPaint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+        mTextPaint.setColorFilter(cf);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+}
diff --git a/src/com/owncloud/android/ui/TextDrawable.java b/src/com/owncloud/android/ui/TextDrawable.java
deleted file mode 100644
index 610e7fe546c..00000000000
--- a/src/com/owncloud/android/ui/TextDrawable.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.owncloud.android.ui;
-
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-/**
- * Created by tobi on 24.05.15.
- */
-public class TextDrawable extends Drawable {
-
-    private final String text;
-    private final Paint paint;
-    private final Paint bg;
-
-    public TextDrawable(String text, int r, int g, int b) {
-
-        this.text = text;
-        Integer color = Color.rgb(r, g, b);
-
-        bg = new Paint();
-        bg.setStyle(Paint.Style.FILL);
-        bg.setColor(color);
-
-        paint = new Paint();
-        paint.setColor(Color.WHITE);
-        paint.setTextSize(20);
-        paint.setAntiAlias(true);
-        paint.setFakeBoldText(true);
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        canvas.drawRect(0,-20,20,40,bg);
-        canvas.drawText(text, 4, 6, paint);
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        paint.setAlpha(alpha);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter cf) {
-        paint.setColorFilter(cf);
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-}
diff --git a/src/com/owncloud/android/ui/activity/BaseActivity.java b/src/com/owncloud/android/ui/activity/BaseActivity.java
new file mode 100644
index 00000000000..61e64b2354b
--- /dev/null
+++ b/src/com/owncloud/android/ui/activity/BaseActivity.java
@@ -0,0 +1,264 @@
+package com.owncloud.android.ui.activity;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
+import android.accounts.OperationCanceledException;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+
+import com.owncloud.android.MainApp;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.status.OCCapability;
+
+/**
+ * Base Activity with common behaviour for activities dealing with ownCloud {@link Account}s .
+ */
+public abstract class BaseActivity extends AppCompatActivity {
+    private static final String TAG = BaseActivity.class.getSimpleName();
+
+    /**
+     * ownCloud {@link Account} where the main {@link OCFile} handled by the activity is located.
+     */
+    private Account mCurrentAccount;
+
+    /**
+     * Capabilites of the server where {@link #mCurrentAccount} lives.
+     */
+    private OCCapability mCapabilities;
+
+    /**
+     * Flag to signal that the activity is finishing to enforce the creation of an ownCloud {@link Account}.
+     */
+    private boolean mRedirectingToSetupAccount = false;
+
+    /**
+     * Flag to signal when the value of mAccount was set.
+     */
+    protected boolean mAccountWasSet;
+
+    /**
+     * Flag to signal when the value of mAccount was restored from a saved state.
+     */
+    protected boolean mAccountWasRestored;
+
+    /**
+     * Access point to the cached database for the current ownCloud {@link Account}.
+     */
+    private FileDataStorageManager mStorageManager = null;
+
+    @Override
+    protected void onNewIntent (Intent intent) {
+        Log_OC.v(TAG, "onNewIntent() start");
+        Account current = AccountUtils.getCurrentOwnCloudAccount(this);
+        if (current != null && mCurrentAccount != null && !mCurrentAccount.name.equals(current.name)) {
+            mCurrentAccount = current;
+        }
+        Log_OC.v(TAG, "onNewIntent() stop");
+    }
+
+    /**
+     *  Since ownCloud {@link Account}s can be managed from the system setting menu, the existence of the {@link
+     *  Account} associated to the instance must be checked every time it is restarted.
+     */
+    @Override
+    protected void onRestart() {
+        Log_OC.v(TAG, "onRestart() start");
+        super.onRestart();
+        boolean validAccount = (mCurrentAccount != null && AccountUtils.exists(mCurrentAccount, this));
+        if (!validAccount) {
+            swapToDefaultAccount();
+        }
+        Log_OC.v(TAG, "onRestart() end");
+    }
+
+    /**
+     * Sets and validates the ownCloud {@link Account} associated to the Activity.
+     * <p/>
+     * If not valid, tries to swap it for other valid and existing ownCloud {@link Account}.
+     * <p/>
+     * POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}.
+     *
+     * @param account      New {@link Account} to set.
+     * @param savedAccount When 'true', account was retrieved from a saved instance state.
+     */
+    protected void setAccount(Account account, boolean savedAccount) {
+        Account oldAccount = mCurrentAccount;
+        boolean validAccount =
+                (account != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(),
+                        account.name));
+        if (validAccount) {
+            mCurrentAccount = account;
+            mAccountWasSet = true;
+            mAccountWasRestored = (savedAccount || mCurrentAccount.equals(oldAccount));
+
+        } else {
+            swapToDefaultAccount();
+        }
+    }
+
+    /**
+     * Tries to swap the current ownCloud {@link Account} for other valid and existing.
+     * <p/>
+     * If no valid ownCloud {@link Account} exists, the the user is requested
+     * to create a new ownCloud {@link Account}.
+     * <p/>
+     * POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}.
+     */
+    protected void swapToDefaultAccount() {
+        // default to the most recently used account
+        Account newAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
+        if (newAccount == null) {
+            /// no account available: force account creation
+            createAccount(true);
+            mRedirectingToSetupAccount = true;
+            mAccountWasSet = false;
+            mAccountWasRestored = false;
+
+        } else {
+            mAccountWasSet = true;
+            mAccountWasRestored = (newAccount.equals(mCurrentAccount));
+            mCurrentAccount = newAccount;
+        }
+    }
+
+    /**
+     * Launches the account creation activity.
+     *
+     * @param mandatoryCreation     When 'true', if an account is not created by the user, the app will be closed.
+     *                              To use when no ownCloud account is available.
+     */
+    protected void createAccount(boolean mandatoryCreation) {
+        AccountManager am = AccountManager.get(getApplicationContext());
+        am.addAccount(MainApp.getAccountType(),
+                null,
+                null,
+                null,
+                this,
+                new AccountCreationCallback(mandatoryCreation),
+                new Handler());
+    }
+
+    /**
+     * Called when the ownCloud {@link Account} associated to the Activity was just updated.
+     * <p/>
+     * Child classes must grant that state depending on the {@link Account} is updated.
+     */
+    protected void onAccountSet(boolean stateWasRecovered) {
+        if (getAccount() != null) {
+            mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver());
+            mCapabilities = mStorageManager.getCapability(mCurrentAccount.name);
+        } else {
+            Log_OC.e(TAG, "onAccountChanged was called with NULL account associated!");
+        }
+    }
+
+    protected void setAccount(Account account) {
+        mCurrentAccount = account;
+    }
+
+    /**
+     * Getter for the capabilities of the server where the current OC account lives.
+     *
+     * @return Capabilities of the server where the current OC account lives. Null if the account is not
+     * set yet.
+     */
+    public OCCapability getCapabilities() {
+        return mCapabilities;
+    }
+
+    /**
+     * Getter for the ownCloud {@link Account} where the main {@link OCFile} handled by the activity
+     * is located.
+     *
+     * @return OwnCloud {@link Account} where the main {@link OCFile} handled by the activity
+     * is located.
+     */
+    public Account getAccount() {
+        return mCurrentAccount;
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        if (mAccountWasSet) {
+            onAccountSet(mAccountWasRestored);
+        }
+    }
+
+    /**
+     * @return 'True' when the Activity is finishing to enforce the setup of a new account.
+     */
+    protected boolean isRedirectingToSetupAccount() {
+        return mRedirectingToSetupAccount;
+    }
+
+    public FileDataStorageManager getStorageManager() {
+        return mStorageManager;
+    }
+
+    /**
+     * Method that gets called when a new account has been successfully created.
+     *
+     * @param future
+     */
+    protected void onAccountCreationSuccessful(AccountManagerFuture<Bundle> future) {
+        // no special handling in base activity
+    }
+
+    /**
+     * Helper class handling a callback from the {@link AccountManager} after the creation of
+     * a new ownCloud {@link Account} finished, successfully or not.
+     */
+    public class AccountCreationCallback implements AccountManagerCallback<Bundle> {
+
+        boolean mMandatoryCreation;
+
+        /**
+         * Constuctor
+         *
+         * @param mandatoryCreation     When 'true', if an account was not created, the app is closed.
+         */
+        public AccountCreationCallback(boolean mandatoryCreation) {
+            mMandatoryCreation = mandatoryCreation;
+        }
+
+        @Override
+        public void run(AccountManagerFuture<Bundle> future) {
+            BaseActivity.this.mRedirectingToSetupAccount = false;
+            boolean accountWasSet = false;
+            if (future != null) {
+                try {
+                    Bundle result;
+                    result = future.getResult();
+                    String name = result.getString(AccountManager.KEY_ACCOUNT_NAME);
+                    String type = result.getString(AccountManager.KEY_ACCOUNT_TYPE);
+                    if (AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), name)) {
+                        setAccount(new Account(name, type), false);
+                        accountWasSet = true;
+                    }
+
+                    onAccountCreationSuccessful(future);
+                } catch (OperationCanceledException e) {
+                    Log_OC.d(TAG, "Account creation canceled");
+
+                } catch (Exception e) {
+                    Log_OC.e(TAG, "Account creation finished in exception: ", e);
+                }
+
+            } else {
+                Log_OC.e(TAG, "Account creation callback with null bundle");
+            }
+            if (mMandatoryCreation && !accountWasSet) {
+                moveTaskToBack(true);
+            }
+        }
+    }
+}
diff --git a/src/com/owncloud/android/ui/activity/DrawerActivity.java b/src/com/owncloud/android/ui/activity/DrawerActivity.java
new file mode 100644
index 00000000000..d1481a64090
--- /dev/null
+++ b/src/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -0,0 +1,656 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Andy Scherzinger
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.ui.activity;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerFuture;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.design.widget.NavigationView;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.datamodel.ThumbnailsCacheManager;
+import com.owncloud.android.lib.common.OwnCloudAccount;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.utils.DisplayUtils;
+
+/**
+ * Base class to handle setup of the drawer implementation including user switching and avatar fetching and fallback
+ * generation.
+ */
+public abstract class DrawerActivity extends ToolbarActivity {
+
+    private static final String TAG = DrawerActivity.class.getSimpleName();
+    private static final String KEY_IS_ACCOUNT_CHOOSER_ACTIVE = "IS_ACCOUNT_CHOOSER_ACTIVE";
+    private static final String KEY_CHECKED_MENU_ITEM = "CHECKED_MENU_ITEM";
+    private static final int ACTION_MANAGE_ACCOUNTS = 101;
+    private static final int MENU_ORDER_ACCOUNT = 1;
+    private static final int MENU_ORDER_ACCOUNT_FUNCTION = 2;
+
+    /**
+     * menu account avatar radius.
+     */
+    private float mMenuAccountAvatarRadiusDimension;
+
+    /**
+     * current account avatar radius.
+     */
+    private float mCurrentAccountAvatarRadiusDimension;
+
+    /**
+     * other accounts avatar radius.
+     */
+    private float mOtherAccountAvatarRadiusDimension;
+
+    /**
+     * Reference to the drawer layout.
+     */
+    private DrawerLayout mDrawerLayout;
+
+    /**
+     * Reference to the drawer toggle.
+     */
+    private ActionBarDrawerToggle mDrawerToggle;
+
+    /**
+     * Reference to the navigation view.
+     */
+    private NavigationView mNavigationView;
+
+    /**
+     * Reference to the account chooser toggle.
+     */
+    private ImageView mAccountChooserToggle;
+
+    /**
+     * Reference to the middle account avatar.
+     */
+    private ImageView mAccountMiddleAccountAvatar;
+
+    /**
+     * Reference to the end account avatar.
+     */
+    private ImageView mAccountEndAccountAvatar;
+
+    /**
+     * Flag to signal if the account chooser is active.
+     */
+    private boolean mIsAccountChooserActive;
+
+    /**
+     * Id of the checked menu item.
+     */
+    private int mCheckedMenuItem = Menu.NONE;
+
+    /**
+     * accounts for the (max) three displayed accounts in the drawer header.
+     */
+    private Account[] mAccountsWithAvatars = new Account[3];
+
+    /**
+     * Initializes the drawer, its content and highlights the menu item with the given id.
+     * This method needs to be called after the content view has been set.
+     *
+     * @param menuItemId the menu item to be checked/highlighted
+     */
+    protected void setupDrawer(int menuItemId) {
+        setupDrawer();
+        setDrawerMenuItemChecked(menuItemId);
+    }
+
+    /**
+     * Initializes the drawer and its content.
+     * This method needs to be called after the content view has been set.
+     */
+    protected void setupDrawer() {
+        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+
+        mNavigationView = (NavigationView) findViewById(R.id.nav_view);
+        if (mNavigationView != null) {
+            mAccountChooserToggle = (ImageView) findNavigationViewChildById(R.id.drawer_account_chooser_toogle);
+            mAccountChooserToggle.setImageResource(R.drawable.ic_down);
+            mIsAccountChooserActive = false;
+
+            mAccountMiddleAccountAvatar = (ImageView) findNavigationViewChildById(R.id.drawer_account_middle);
+            mAccountEndAccountAvatar = (ImageView) findNavigationViewChildById(R.id.drawer_account_end);
+
+            // on pre lollipop the light theme adds a black tint to icons with white coloring
+            // ruining the generic avatars, so tinting for icons is deactivated pre lollipop
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                mNavigationView.setItemIconTintList(null);
+            }
+
+            setupDrawerContent(mNavigationView);
+
+            findNavigationViewChildById(R.id.drawer_active_user)
+                    .setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            toggleAccountList();
+                        }
+                    });
+        }
+
+        mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, R.string.drawer_open, R.string.drawer_close) {
+
+            /** Called when a drawer has settled in a completely closed state. */
+            public void onDrawerClosed(View view) {
+                super.onDrawerClosed(view);
+                // standard behavior of drawer is to switch to the standard menu on closing
+                if (mIsAccountChooserActive) {
+                    toggleAccountList();
+                }
+                invalidateOptionsMenu();
+            }
+
+            /** Called when a drawer has settled in a completely open state. */
+            public void onDrawerOpened(View drawerView) {
+                super.onDrawerOpened(drawerView);
+                mDrawerToggle.setDrawerIndicatorEnabled(true);
+                invalidateOptionsMenu();
+            }
+        };
+
+        // Set the drawer toggle as the DrawerListener
+        mDrawerLayout.addDrawerListener(mDrawerToggle);
+        mDrawerToggle.setDrawerIndicatorEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    }
+
+    /**
+     * setup drawer content, basically setting the item selected listener.
+     *
+     * @param navigationView the drawers navigation view
+     */
+    protected void setupDrawerContent(NavigationView navigationView) {
+        navigationView.setNavigationItemSelectedListener(
+                new NavigationView.OnNavigationItemSelectedListener() {
+                    @Override
+                    public boolean onNavigationItemSelected(MenuItem menuItem) {
+                        mDrawerLayout.closeDrawers();
+
+                        switch (menuItem.getItemId()) {
+                            case R.id.nav_all_files:
+                                menuItem.setChecked(true);
+                                mCheckedMenuItem = menuItem.getItemId();
+
+                                allFilesOption();
+                                // TODO activate when On Device branch is merged
+                                // MainApp.showOnlyFilesOnDevice(false);
+                                // refreshDirectory();
+                                break;
+                            // TODO activate when On Device branch is merged
+                            // case R.id.nav_on_device:
+                            //     menuItem.setChecked(true);
+                            //     mCheckedMenuItem = menuItem.getItemId();
+                            //     MainApp.showOnlyFilesOnDevice(true);
+                            //     refreshDirectory();
+                            //     break;
+                            case R.id.nav_uploads:
+                                Intent uploadListIntent = new Intent(getApplicationContext(),
+                                        UploadListActivity.class);
+                                uploadListIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                                startActivity(uploadListIntent);
+                                break;
+                            case R.id.nav_settings:
+                                Intent settingsIntent = new Intent(getApplicationContext(),
+                                        Preferences.class);
+                                startActivity(settingsIntent);
+                                break;
+                            case R.id.drawer_menu_account_add:
+                                createAccount(false);
+                                break;
+                            case R.id.drawer_menu_account_manage:
+                                Intent manageAccountsIntent = new Intent(getApplicationContext(),
+                                        ManageAccountsActivity.class);
+                                startActivityForResult(manageAccountsIntent, ACTION_MANAGE_ACCOUNTS);
+                                break;
+                            case Menu.NONE:
+                                // account clicked
+                                accountClicked(menuItem.getTitle().toString());
+                            default:
+                                Log_OC.i(TAG, "Unknown drawer menu item clicked: " + menuItem.getTitle());
+                        }
+
+                        return true;
+                    }
+                });
+
+        // handle correct state
+        if (mIsAccountChooserActive) {
+            mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_accounts, true);
+        } else {
+            mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_accounts, false);
+        }
+    }
+
+    /**
+     * sets the new/current account and restarts. In case the given account equals the actual/current account the
+     * call will be ignored.
+     *
+     * @param accountName The account name to be set
+     */
+    private void accountClicked(String accountName) {
+        if (!AccountUtils.getCurrentOwnCloudAccount(getApplicationContext()).name.equals(accountName)) {
+            AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), accountName);
+            restart();
+        }
+    }
+
+    /**
+     * click method for mini avatars in drawer header.
+     *
+     * @param view the clicked ImageView
+     */
+    public void onAccountDrawerClick(View view) {
+        accountClicked(view.getContentDescription().toString());
+    }
+
+    /**
+     * checks if the drawer exists and is opened.
+     *
+     * @return <code>true</code> if the drawer is open, else <code>false</code>
+     */
+    public boolean isDrawerOpen() {
+        return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(GravityCompat.START);
+    }
+
+    /**
+     * closes the drawer.
+     */
+    public void closeDrawer() {
+        if (mDrawerLayout != null) {
+            mDrawerLayout.closeDrawer(GravityCompat.START);
+        }
+    }
+
+    /**
+     * opens the drawer.
+     */
+    public void openDrawer() {
+        if (mDrawerLayout != null) {
+            mDrawerLayout.openDrawer(GravityCompat.START);
+        }
+    }
+
+    /**
+     * Enable or disable interaction with all drawers.
+     *
+     * @param lockMode The new lock mode for the given drawer. One of {@link DrawerLayout#LOCK_MODE_UNLOCKED},
+     *                 {@link DrawerLayout#LOCK_MODE_LOCKED_CLOSED} or {@link DrawerLayout#LOCK_MODE_LOCKED_OPEN}.
+     */
+    public void setDrawerLockMode(int lockMode) {
+        if (mDrawerLayout != null) {
+            mDrawerLayout.setDrawerLockMode(lockMode);
+        }
+    }
+
+    /**
+     * Enable or disable the drawer indicator.
+     *
+     * @param enable <code>true</code> to enable, <code>false</code> to disable
+     */
+    public void setDrawerIndicatorEnabled(boolean enable) {
+        if (mDrawerToggle != null) {
+            mDrawerToggle.setDrawerIndicatorEnabled(enable);
+        }
+    }
+
+    /**
+     * updates the account list in the drawer.
+     */
+    public void updateAccountList() {
+        Account[] accounts = AccountManager.get(this).getAccountsByType(MainApp.getAccountType());
+        if (mNavigationView != null && mDrawerLayout != null) {
+            if (accounts.length > 0) {
+                repopulateAccountList(accounts);
+                setAccountInDrawer(AccountUtils.getCurrentOwnCloudAccount(this));
+                populateDrawerOwnCloudAccounts();
+
+                // activate second/end account avatar
+                if (mAccountsWithAvatars[1] != null) {
+                    DisplayUtils.showAccountAvatar(
+                        mAccountsWithAvatars[1],
+                        (ImageView) findNavigationViewChildById(R.id.drawer_account_end),
+                        mOtherAccountAvatarRadiusDimension,
+                        false
+                    );
+                    mAccountEndAccountAvatar.setVisibility(View.VISIBLE);
+                } else {
+                    mAccountEndAccountAvatar.setVisibility(View.GONE);
+                }
+
+                // activate third/middle account avatar
+                if (mAccountsWithAvatars[2] != null) {
+                    DisplayUtils.showAccountAvatar(
+                        mAccountsWithAvatars[2],
+                        (ImageView) findNavigationViewChildById(R.id.drawer_account_middle),
+                        mOtherAccountAvatarRadiusDimension,
+                        false
+                    );
+                    mAccountMiddleAccountAvatar.setVisibility(View.VISIBLE);
+                } else {
+                    mAccountMiddleAccountAvatar.setVisibility(View.GONE);
+                }
+            } else {
+                mAccountEndAccountAvatar.setVisibility(View.GONE);
+                mAccountMiddleAccountAvatar.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    /**
+     * re-populates the account list.
+     *
+     * @param accounts list of accounts
+     */
+    private void repopulateAccountList(Account[] accounts) {
+        // remove all accounts from list
+        mNavigationView.getMenu().removeGroup(R.id.drawer_menu_accounts);
+
+        // add all accounts to list
+        for (int i = 0; i < accounts.length; i++) {
+            if (!getAccount().name.equals(accounts[i].name)) {
+
+                MenuItem accountMenuItem = mNavigationView.getMenu().add(
+                        R.id.drawer_menu_accounts,
+                        Menu.NONE,
+                        MENU_ORDER_ACCOUNT,
+                        accounts[i].name
+                );
+                ThumbnailsCacheManager.GetAvatarTask task =
+                    new ThumbnailsCacheManager.GetAvatarTask(
+                        accountMenuItem,
+                        accounts[i],
+                        mMenuAccountAvatarRadiusDimension,
+                        false
+                    );
+                task.execute();
+            }
+        }
+
+        // re-add add-account and manage-accounts
+        mNavigationView.getMenu().add(R.id.drawer_menu_accounts, R.id.drawer_menu_account_add,
+                MENU_ORDER_ACCOUNT_FUNCTION,
+                getResources().getString(R.string.prefs_add_account)).setIcon(R.drawable.ic_account_plus);
+        mNavigationView.getMenu().add(R.id.drawer_menu_accounts, R.id.drawer_menu_account_manage,
+                MENU_ORDER_ACCOUNT_FUNCTION,
+                getResources().getString(R.string.drawer_manage_accounts)).setIcon(R.drawable.ic_settings);
+
+        // adding sets menu group back to visible, so safety check and setting invisible
+        showMenu();
+    }
+
+    /**
+     * Method that gets called on drawer menu click for 'All Files'.
+     */
+    public abstract void allFilesOption();
+
+    /**
+     * Updates title bar and home buttons (state and icon).
+     * <p/>
+     * Assumes that navigation drawer is NOT visible.
+     */
+    protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
+        super.updateActionBarTitleAndHomeButton(chosenFile);
+
+        /// set home button properties
+        if (mDrawerToggle != null) {
+            mDrawerToggle.setDrawerIndicatorEnabled(isRoot(chosenFile));
+        }
+    }
+
+    /**
+     * sets the given account name in the drawer in case the drawer is available. The account name is shortened
+     * beginning from the @-sign in the username.
+     *
+     * @param account the account to be set in the drawer
+     */
+    protected void setAccountInDrawer(Account account) {
+        if (mDrawerLayout != null && account != null) {
+            TextView username = (TextView) findNavigationViewChildById(R.id.drawer_username);
+            TextView usernameFull = (TextView) findNavigationViewChildById(R.id.drawer_username_full);
+            usernameFull.setText(account.name);
+            try {
+                OwnCloudAccount oca = new OwnCloudAccount(account, this);
+                username.setText(oca.getDisplayName());
+
+            } catch (Exception e) {
+                Log_OC.w(TAG, "Couldn't read display name of account; using account name instead");
+
+                username.setText(AccountUtils.getUsernameOfAccount(account.name));
+            }
+
+            DisplayUtils.showAccountAvatar(
+                account,
+                (ImageView) findNavigationViewChildById(R.id.drawer_current_account),
+                mCurrentAccountAvatarRadiusDimension,
+                false
+            );
+        }
+    }
+
+    /**
+     * Toggle between standard menu and account list including saving the state.
+     */
+    private void toggleAccountList() {
+        mIsAccountChooserActive = !mIsAccountChooserActive;
+        showMenu();
+    }
+
+    /**
+     * depending on the #mIsAccountChooserActive flag shows the account chooser or the standard menu.
+     */
+    private void showMenu() {
+        if (mNavigationView != null) {
+            if (mIsAccountChooserActive) {
+                mAccountChooserToggle.setImageResource(R.drawable.ic_up);
+                mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_accounts, true);
+                mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_standard, false);
+            } else {
+                mAccountChooserToggle.setImageResource(R.drawable.ic_down);
+                mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_accounts, false);
+                mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_standard, true);
+            }
+        }
+    }
+
+    /**
+     * checks/highlights the provided menu item if the drawer has been initialized and the menu item exists.
+     *
+     * @param menuItemId the menu item to be highlighted
+     */
+    protected void setDrawerMenuItemChecked(int menuItemId) {
+        if (mNavigationView != null && mNavigationView.getMenu() != null && mNavigationView.getMenu().findItem
+                (menuItemId) != null) {
+            mNavigationView.getMenu().findItem(menuItemId).setChecked(true);
+            mCheckedMenuItem = menuItemId;
+        } else {
+            Log_OC.w(TAG, "setDrawerMenuItemChecked has been called with invalid menu-item-ID");
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            mIsAccountChooserActive = savedInstanceState.getBoolean(KEY_IS_ACCOUNT_CHOOSER_ACTIVE, false);
+            mCheckedMenuItem = savedInstanceState.getInt(KEY_CHECKED_MENU_ITEM, Menu.NONE);
+        }
+
+        mCurrentAccountAvatarRadiusDimension = getResources()
+                .getDimension(R.dimen.nav_drawer_header_avatar_radius);
+        mOtherAccountAvatarRadiusDimension = getResources()
+                .getDimension(R.dimen.nav_drawer_header_avatar_other_accounts_radius);
+        mMenuAccountAvatarRadiusDimension = getResources()
+                .getDimension(R.dimen.nav_drawer_menu_avatar_radius);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putBoolean(KEY_IS_ACCOUNT_CHOOSER_ACTIVE, mIsAccountChooserActive);
+        outState.putInt(KEY_CHECKED_MENU_ITEM, mCheckedMenuItem);
+    }
+
+    @Override
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+
+        mIsAccountChooserActive = savedInstanceState.getBoolean(KEY_IS_ACCOUNT_CHOOSER_ACTIVE, false);
+        mCheckedMenuItem = savedInstanceState.getInt(KEY_CHECKED_MENU_ITEM, Menu.NONE);
+
+        // (re-)setup drawer state
+        showMenu();
+
+        // check/highlight the menu item if present
+        if (mCheckedMenuItem > Menu.NONE || mCheckedMenuItem < Menu.NONE) {
+            setDrawerMenuItemChecked(mCheckedMenuItem);
+        }
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        // Sync the toggle state after onRestoreInstanceState has occurred.
+        if (mDrawerToggle != null) {
+            mDrawerToggle.syncState();
+            if (isDrawerOpen()) {
+                mDrawerToggle.setDrawerIndicatorEnabled(true);
+            }
+        }
+        updateAccountList();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        if (mDrawerToggle != null) {
+            mDrawerToggle.onConfigurationChanged(newConfig);
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (isDrawerOpen()) {
+            closeDrawer();
+            return;
+        }
+        super.onBackPressed();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        setDrawerMenuItemChecked(mCheckedMenuItem);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        // update Account list and active account if Manage Account activity replies with
+        // - ACCOUNT_LIST_CHANGED = true
+        // - RESULT_OK
+        if (requestCode == ACTION_MANAGE_ACCOUNTS
+                && resultCode == RESULT_OK
+                && data.getBooleanExtra(ManageAccountsActivity.KEY_ACCOUNT_LIST_CHANGED, false)) {
+
+            // current account has changed
+            if (data.getBooleanExtra(ManageAccountsActivity.KEY_CURRENT_ACCOUNT_CHANGED, false)) {
+                setAccount(AccountUtils.getCurrentOwnCloudAccount(this));
+                restart();
+            } else {
+                updateAccountList();
+            }
+        }
+    }
+
+    /**
+     * Finds a view that was identified by the id attribute from the drawer header.
+     *
+     * @param id the view's id
+     * @return The view if found or <code>null</code> otherwise.
+     */
+    private View findNavigationViewChildById(int id) {
+        return ((NavigationView) findViewById(R.id.nav_view)).getHeaderView(0).findViewById(id);
+    }
+
+    /**
+     * restart helper method which is called after a changing the current account.
+     */
+    protected abstract void restart();
+
+    @Override
+    protected void onAccountCreationSuccessful(AccountManagerFuture<Bundle> future) {
+        super.onAccountCreationSuccessful(future);
+        updateAccountList();
+        restart();
+    }
+
+    /**
+     * populates the avatar drawer array with the first three ownCloud {@link Account}s while the first element is
+     * always the current account.
+     */
+    private void populateDrawerOwnCloudAccounts() {
+        mAccountsWithAvatars = new Account[3];
+        Account[] accountsAll = AccountManager.get(this).getAccountsByType
+                (MainApp.getAccountType());
+        Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(this);
+
+        mAccountsWithAvatars[0] = currentAccount;
+        int j = 0;
+        for (int i = 1; i <= 2 && i < accountsAll.length && j < accountsAll.length; j++) {
+            if (!currentAccount.equals(accountsAll[j])) {
+                mAccountsWithAvatars[i] = accountsAll[j];
+                i++;
+            }
+        }
+    }
+
+    /**
+     * Adds other listeners to react on changes of the drawer layout.
+     *
+     * @param listener      Object interested in changes of the drawer layout.
+     */
+    public void addDrawerListener(DrawerLayout.DrawerListener listener) {
+        if (mDrawerLayout != null) {
+            mDrawerLayout.addDrawerListener(listener);
+        } else {
+            Log_OC.e(TAG, "Drawer layout not ready to add drawer listener");
+        }
+    }
+}
diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
index 39a9c3e3d56..70fa82c613a 100644
--- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
+++ b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
@@ -47,7 +47,7 @@
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
+import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.utils.FileStorageUtils;
 
 
@@ -216,7 +216,7 @@ private class MoveFilesTask extends AsyncTask<Void, Void, Boolean> {
         @Override
         protected void onPreExecute () {
             /// progress dialog and disable 'Move' button
-            mCurrentDialog = IndeterminateProgressDialog.newInstance(R.string.wait_a_moment, false);
+            mCurrentDialog = LoadingDialog.newInstance(R.string.wait_a_moment, false);
             mCurrentDialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);
             findViewById(R.id.ok).setEnabled(false);
         }
diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 5f6b965e272..0245eef4750 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -23,38 +23,25 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.accounts.AccountManagerCallback;
-import android.accounts.AccountManagerFuture;
 import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.helpers.FileOperationsHelper;
 import com.owncloud.android.files.services.FileDownloader;
@@ -71,7 +58,6 @@
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.operations.CreateShareWithShareeOperation;
 import com.owncloud.android.operations.GetSharesForFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
@@ -81,21 +67,16 @@
 import com.owncloud.android.operations.UpdateShareViaLinkOperation;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
-import com.owncloud.android.ui.NavigationDrawerItem;
-import com.owncloud.android.ui.adapter.NavigationDrawerListAdapter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 
-import java.util.ArrayList;
-
 
 /**
- * Activity with common behaviour for activities handling {@link OCFile}s in ownCloud
- * {@link Account}s .
+ * Activity with common behaviour for activities handling {@link OCFile}s in ownCloud {@link Account}s .
  */
-public class FileActivity extends AppCompatActivity
+public class FileActivity extends DrawerActivity
         implements OnRemoteOperationListener, ComponentsGetter, SslUntrustedCertDialog.OnSslUntrustedCertListener {
 
     public static final String EXTRA_FILE = "com.owncloud.android.ui.activity.FILE";
@@ -119,35 +100,15 @@ public class FileActivity extends AppCompatActivity
     private static final String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";
     private static final String DIALOG_CERT_NOT_SAVED = "DIALOG_CERT_NOT_SAVED";
 
-    /** OwnCloud {@link Account} where the main {@link OCFile} handled by the activity is located.*/
-    private Account mAccount;
-
-    /** Capabilites of the server where {@link #mAccount} lives */
-     private OCCapability mCapabilities;
-
      /** Main {@link OCFile} handled by the activity.*/
     private OCFile mFile;
 
-
-    /** Flag to signal that the activity will is finishing to enforce the creation of an ownCloud
-     * {@link Account} */
-    private boolean mRedirectingToSetupAccount = false;
-
-    /** Flag to signal when the value of mAccount was set */
-    protected boolean mAccountWasSet;
-
-    /** Flag to signal when the value of mAccount was restored from a saved state */
-    protected boolean mAccountWasRestored;
-
     /** Flag to signal if the activity is launched by a notification */
     private boolean mFromNotification;
 
     /** Messages handler associated to the main thread and the life cycle of the activity */
     private Handler mHandler;
 
-    /** Access point to the cached database for the current ownCloud {@link Account} */
-    private FileDataStorageManager mStorageManager = null;
-
     private FileOperationsHelper mFileOperationsHelper;
 
     private ServiceConnection mOperationsServiceConnection = null;
@@ -160,24 +121,6 @@ public class FileActivity extends AppCompatActivity
     protected FileUploaderBinder mUploaderBinder = null;
     private ServiceConnection mDownloadServiceConnection, mUploadServiceConnection = null;
 
-    // Navigation Drawer
-    protected DrawerLayout mDrawerLayout;
-    protected ActionBarDrawerToggle mDrawerToggle;
-    protected ListView mDrawerList;
-
-    // Slide menu items
-    protected String[] mDrawerTitles;
-    protected String[] mDrawerContentDescriptions;
-
-    protected ArrayList<NavigationDrawerItem> mDrawerItems;
-
-    protected NavigationDrawerListAdapter mNavigationDrawerAdapter = null;
-
-
-
-    // TODO re-enable when "Accounts" is available in Navigation Drawer
-//    protected boolean mShowAccounts = false;
-
     /**
      * Loads the ownCloud {@link Account} and main {@link OCFile} to be handled by the instance of
      * the {@link FileActivity}.
@@ -229,40 +172,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
     }
 
-    @Override
-    protected void onNewIntent (Intent intent) {
-        Log_OC.v(TAG, "onNewIntent() start");
-        Account current = AccountUtils.getCurrentOwnCloudAccount(this);
-        if (current != null && mAccount != null && !mAccount.name.equals(current.name)) {
-            mAccount = current;
-        }
-        Log_OC.v(TAG, "onNewIntent() stop");
-    }
-
-    /**
-     *  Since ownCloud {@link Account}s can be managed from the system setting menu,
-     *  the existence of the {@link Account} associated to the instance must be checked
-     *  every time it is restarted.
-     */
-    @Override
-    protected void onRestart() {
-        Log_OC.v(TAG, "onRestart() start");
-        super.onRestart();
-        boolean validAccount = (mAccount != null && AccountUtils.exists(mAccount, this));
-        if (!validAccount) {
-            swapToDefaultAccount();
-        }
-        Log_OC.v(TAG, "onRestart() end");
-    }
-
-
     @Override
     protected void onStart() {
         super.onStart();
-
-        if (mAccountWasSet) {
-            onAccountSet(mAccountWasRestored);
-        }
     }
 
     @Override
@@ -283,6 +195,7 @@ protected void onPause()  {
         super.onPause();
     }
 
+
     @Override
     protected void onDestroy() {
         if (mOperationsServiceConnection != null) {
@@ -301,283 +214,6 @@ protected void onDestroy() {
         super.onDestroy();
     }
 
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        // Sync the toggle state after onRestoreInstanceState has occurred.
-        if (mDrawerToggle != null) {
-            mDrawerToggle.syncState();
-            if (isDrawerOpen()) {
-                getSupportActionBar().setTitle(R.string.app_name);
-                mDrawerToggle.setDrawerIndicatorEnabled(true);
-            }
-        }
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        if (mDrawerToggle != null) {
-            mDrawerToggle.onConfigurationChanged(newConfig);
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (isDrawerOpen()) {
-            closeNavDrawer();
-            return;
-        }
-        super.onBackPressed();
-    }
-
-    /**
-     * checks if the drawer exists and is opened.
-     *
-     * @return <code>true</code> if the drawer is open, else <code>false</code>
-     */
-    public boolean isDrawerOpen() {
-        if(mDrawerLayout != null) {
-            return mDrawerLayout.isDrawerOpen(GravityCompat.START);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * closes the navigation drawer.
-     */
-    public void closeNavDrawer() {
-        if(mDrawerLayout != null) {
-            mDrawerLayout.closeDrawer(GravityCompat.START);
-        }
-    }
-
-    protected void initDrawer(){
-        // constant settings for action bar when navigation drawer is inited
-        getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
-
-
-        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-        // Notification Drawer
-        RelativeLayout navigationDrawerLayout = (RelativeLayout) findViewById(R.id.left_drawer);
-        mDrawerList = (ListView) navigationDrawerLayout.findViewById(R.id.drawer_list);
-
-        // TODO re-enable when "Accounts" is available in Navigation Drawer
-//        // load Account in the Drawer Title
-//        // User-Icon
-//        ImageView userIcon = (ImageView) navigationDrawerLayout.findViewById(R.id.drawer_userIcon);
-//        userIcon.setImageResource(DisplayUtils.getSeasonalIconId());
-//
-//        // Username
-//        TextView username = (TextView) navigationDrawerLayout.findViewById(R.id.drawer_username);
-//        Account account = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
-//
-//        if (account != null) {
-//            int lastAtPos = account.name.lastIndexOf("@");
-//            username.setText(account.name.substring(0, lastAtPos));
-//        }
-
-        // Display username in drawer
-        setUsernameInDrawer(navigationDrawerLayout, AccountUtils.getCurrentOwnCloudAccount(getApplicationContext()));
-
-        // load slide menu items
-        mDrawerTitles = getResources().getStringArray(R.array.drawer_items);
-
-        // nav drawer content description from resources
-        mDrawerContentDescriptions = getResources().
-                getStringArray(R.array.drawer_content_descriptions);
-
-        // nav drawer items
-        mDrawerItems = new ArrayList<NavigationDrawerItem>();
-        // adding nav drawer items to array
-        // TODO re-enable when "Accounts" is available in Navigation Drawer
-        // Accounts
-        // mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[0],
-        // mDrawerContentDescriptions[0]));
-        // All Files
-        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[0], mDrawerContentDescriptions[0],
-                R.drawable.ic_folder_open));
-
-        // TODO Enable when "On Device" is recovered
-        // On Device
-        //mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[2],
-        //        mDrawerContentDescriptions[2]));
-
-        // Uploads
-        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[1], mDrawerContentDescriptions[2],
-                R.drawable.ic_uploads));
-
-        // Settings
-        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[2], mDrawerContentDescriptions[1],
-                R.drawable.ic_settings));
-
-        // setting the nav drawer list adapter
-        mNavigationDrawerAdapter = new NavigationDrawerListAdapter(getApplicationContext(), this,
-                mDrawerItems);
-        mDrawerList.setAdapter(mNavigationDrawerAdapter);
-
-
-        mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,R.string.drawer_open,R.string.drawer_close) {
-
-
-            /** Called when a drawer has settled in a completely closed state. */
-            public void onDrawerClosed(View view) {
-                super.onDrawerClosed(view);
-                updateActionBarTitleAndHomeButton(null);
-                invalidateOptionsMenu();
-            }
-
-            /** Called when a drawer has settled in a completely open state. */
-            public void onDrawerOpened(View drawerView) {
-                super.onDrawerOpened(drawerView);
-                getSupportActionBar().setTitle(R.string.app_name);
-                mDrawerToggle.setDrawerIndicatorEnabled(true);
-                invalidateOptionsMenu();
-            }
-        };
-        
-        // Set the list's click listener
-        mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
-
-        // Set the drawer toggle as the DrawerListener
-        mDrawerLayout.setDrawerListener(mDrawerToggle);
-        mDrawerToggle.setDrawerIndicatorEnabled(false);
-    }
-
-    /**
-     * sets the given account name in the drawer in case the drawer is available. The account name
-     * is shortened beginning from the @-sign in the username.
-     *
-     * @param navigationDrawerLayout the drawer layout to be used
-     * @param account                the account to be set in the drawer
-     */
-    protected void setUsernameInDrawer(View navigationDrawerLayout, Account account) {
-        if (navigationDrawerLayout != null && account != null) {
-            TextView username = (TextView) navigationDrawerLayout.findViewById(R.id.drawer_username);
-            try {
-                OwnCloudAccount oca = new OwnCloudAccount(account, this);
-                username.setText(oca.getDisplayName());
-
-            } catch (Exception e) {
-                Log_OC.w(TAG, "Couldn't read display name of account; using account name instead");
-
-                int lastAtPos = account.name.lastIndexOf("@");
-                username.setText(account.name.substring(0, lastAtPos));
-            }
-        }
-    }
-
-    /**
-     * Updates title bar and home buttons (state and icon).
-     *
-     * Assumes that navigation drawer is NOT visible.
-     */
-    protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
-        String title = getDefaultTitle();    // default
-        boolean inRoot;
-
-        /// choose the appropiate title
-        if (chosenFile == null) {
-            chosenFile = mFile;     // if no file is passed, current file decides
-        }
-        inRoot = (
-                chosenFile == null ||
-                (chosenFile.isFolder() && chosenFile.getParentId() == FileDataStorageManager.ROOT_PARENT_ID)
-        );
-        if (!inRoot) {
-            title = chosenFile.getFileName();
-        }
-
-        /// set the chosen title
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setTitle(title);
-        /// also as content description
-        View actionBarTitleView = getWindow().getDecorView().findViewById(
-                getResources().getIdentifier("action_bar_title", "id", "android")
-        );
-        if (actionBarTitleView != null) {    // it's null in Android 2.x
-            actionBarTitleView.setContentDescription(title);
-        }
-
-        /// set home button properties
-        mDrawerToggle.setDrawerIndicatorEnabled(inRoot);
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setDisplayShowTitleEnabled(true);
-
-    }
-
-    protected String getDefaultTitle() {
-        return getString(R.string.default_display_name_for_root_folder);
-    }
-
-    /**
-     *  Sets and validates the ownCloud {@link Account} associated to the Activity.
-     *
-     *  If not valid, tries to swap it for other valid and existing ownCloud {@link Account}.
-     *
-     *  POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}.
-     *
-     *  @param account          New {@link Account} to set.
-     *  @param savedAccount     When 'true', account was retrieved from a saved instance state.
-     */
-    protected void setAccount(Account account, boolean savedAccount) {
-        Account oldAccount = mAccount;
-        boolean validAccount =
-                (account != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(),
-                        account.name));
-        if (validAccount) {
-            mAccount = account;
-            mAccountWasSet = true;
-            mAccountWasRestored = (savedAccount || mAccount.equals(oldAccount));
-
-        } else {
-            swapToDefaultAccount();
-        }
-    }
-
-
-    /**
-     *  Tries to swap the current ownCloud {@link Account} for other valid and existing.
-     *
-     *  If no valid ownCloud {@link Account} exists, the the user is requested
-     *  to create a new ownCloud {@link Account}.
-     *
-     *  POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}.
-     */
-    private void swapToDefaultAccount() {
-        // default to the most recently used account
-        Account newAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
-        if (newAccount == null) {
-            /// no account available: force account creation
-            createFirstAccount();
-            mRedirectingToSetupAccount = true;
-            mAccountWasSet = false;
-            mAccountWasRestored = false;
-
-        } else {
-            mAccountWasSet = true;
-            mAccountWasRestored = (newAccount.equals(mAccount));
-            mAccount = newAccount;
-        }
-    }
-
-
-    /**
-     * Launches the account creation activity. To use when no ownCloud account is available
-     */
-    private void createFirstAccount() {
-        AccountManager am = AccountManager.get(getApplicationContext());
-        am.addAccount(MainApp.getAccountType(),
-                null,
-                null,
-                null,
-                this,
-                new AccountCreationCallback(),
-                null);
-    }
-
-
     /**
      * {@inheritDoc}
      */
@@ -614,34 +250,6 @@ public void setFile(OCFile file) {
         mFile = file;
     }
 
-
-    /**
-     * Getter for the ownCloud {@link Account} where the main {@link OCFile} handled by the activity
-     * is located.
-     *
-     * @return  OwnCloud {@link Account} where the main {@link OCFile} handled by the activity
-     *          is located.
-     */
-    public Account getAccount() {
-        return mAccount;
-    }
-
-    protected void setAccount(Account account) {
-        mAccount = account;
-    }
-
-
-    /**
-     * Getter for the capabilities of the server where the current OC account lives.
-     *
-     * @return  Capabilities of the server where the current OC account lives. Null if the account is not
-     *          set yet.
-     */
-    public OCCapability getCapabilities() {
-        return mCapabilities;
-    }
-
-
     /**
      * @return Value of mFromNotification: True if the Activity is launched by a notification
      */
@@ -649,13 +257,6 @@ public boolean fromNotification() {
         return mFromNotification;
     }
 
-    /**
-     * @return 'True' when the Activity is finishing to enforce the setup of a new account.
-     */
-    protected boolean isRedirectingToSetupAccount() {
-        return mRedirectingToSetupAccount;
-    }
-
     public OperationsServiceBinder getOperationsServiceBinder() {
         return mOperationsServiceBinder;
     }
@@ -664,67 +265,6 @@ protected ServiceConnection newTransferenceServiceConnection() {
         return null;
     }
 
-    /**
-     * Helper class handling a callback from the {@link AccountManager} after the creation of
-     * a new ownCloud {@link Account} finished, successfully or not.
-     *
-     * At this moment, only called after the creation of the first account.
-     */
-    public class AccountCreationCallback implements AccountManagerCallback<Bundle> {
-
-        @Override
-        public void run(AccountManagerFuture<Bundle> future) {
-            FileActivity.this.mRedirectingToSetupAccount = false;
-            boolean accountWasSet = false;
-            if (future != null) {
-                try {
-                    Bundle result;
-                    result = future.getResult();
-                    String name = result.getString(AccountManager.KEY_ACCOUNT_NAME);
-                    String type = result.getString(AccountManager.KEY_ACCOUNT_TYPE);
-                    if (AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), name)) {
-                        setAccount(new Account(name, type), false);
-                        accountWasSet = true;
-                    }
-                } catch (OperationCanceledException e) {
-                    Log_OC.d(TAG, "Account creation canceled");
-
-                } catch (Exception e) {
-                    Log_OC.e(TAG, "Account creation finished in exception: ", e);
-                }
-
-            } else {
-                Log_OC.e(TAG, "Account creation callback with null bundle");
-            }
-            if (!accountWasSet) {
-                moveTaskToBack(true);
-            }
-        }
-
-    }
-
-
-    /**
-     *  Called when the ownCloud {@link Account} associated to the Activity was just updated.
-     *
-     *  Child classes must grant that state depending on the {@link Account} is updated.
-     */
-    protected void onAccountSet(boolean stateWasRecovered) {
-        if (getAccount() != null) {
-            mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver());
-            mCapabilities = mStorageManager.getCapability(mAccount.name);
-
-        } else {
-            Log_OC.e(TAG, "onAccountChanged was called with NULL account associated!");
-        }
-    }
-
-
-    public FileDataStorageManager getStorageManager() {
-        return mStorageManager;
-    }
-
-
     public OnRemoteOperationListener getRemoteOperationListener() {
         return this;
     }
@@ -833,7 +373,8 @@ protected void requestCredentialsUpdate(Context context, Account account) {
                 account = getAccount();
             }
             OwnCloudClient client;
-            OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);
+            OwnCloudAccount ocAccount =
+                    new OwnCloudAccount(account, context);
             client = (OwnCloudClientManagerFactory.getDefaultSingleton().
                     removeClientFor(ocAccount));
             if (client != null) {
@@ -907,14 +448,14 @@ protected void updateFileFromDB(){
     /**
      * Show loading dialog
      */
-    public void showLoadingDialog(String message) {
+    public void showLoadingDialog(int messageId) {
         // grant that only one waiting dialog is shown
         dismissLoadingDialog();
         // Construct dialog
         Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
         if (frag == null) {
             Log_OC.d(TAG, "show loading dialog");
-            LoadingDialog loading = new LoadingDialog(message);
+            LoadingDialog loading = LoadingDialog.newInstance(messageId, false);
             FragmentManager fm = getSupportFragmentManager();
             FragmentTransaction ft = fm.beginTransaction();
             loading.show(ft, DIALOG_WAIT_TAG);
@@ -968,7 +509,6 @@ public void onServiceConnected(ComponentName component, IBinder service) {
             }
         }
 
-
         @Override
         public void onServiceDisconnected(ComponentName component) {
             if (component.equals(new ComponentName(FileActivity.this, OperationsService.class))) {
@@ -979,26 +519,24 @@ public void onServiceDisconnected(ComponentName component) {
         }
     }
 
-
     @Override
     public FileDownloaderBinder getFileDownloaderBinder() {
         return mDownloaderBinder;
     }
 
-
     @Override
     public FileUploaderBinder getFileUploaderBinder() {
         return mUploaderBinder;
     }
 
-
+    @Override
     public void restart(){
         Intent i = new Intent(this, FileDisplayActivity.class);
         i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        i.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(i);
     }
 
+    @Override
     public void allFilesOption(){
         restart();
     }
@@ -1036,45 +574,4 @@ public void onCancelCertificate() {
         // nothing to do
     }
 
-    private class DrawerItemClickListener implements ListView.OnItemClickListener {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            // TODO re-enable when "Accounts" is available in Navigation Drawer
-//            if (mShowAccounts && position > 0){
-//                position = position - 1;
-//            }
-            switch (position){
-                // TODO re-enable when "Accounts" is available in Navigation Drawer
-//                case 0: // Accounts
-//                    mShowAccounts = !mShowAccounts;
-//                    mNavigationDrawerAdapter.setShowAccounts(mShowAccounts);
-//                    mNavigationDrawerAdapter.notifyDataSetChanged();
-//                    break;
-
-                case 0: // All Files
-                    allFilesOption();
-                    break;
-
-                // TODO Enable when "On Device" is recovered ?
-//                case 2:
-//                    MainApp.showOnlyFilesOnDevice(true);
-//                    break;
-
-                case 1: // Uploads
-                    Intent uploadListIntent = new Intent(getApplicationContext(),
-                            UploadListActivity.class);
-                    uploadListIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    startActivity(uploadListIntent);
-                    break;
-
-                case 2: // Settings
-                    Intent settingsIntent = new Intent(getApplicationContext(),
-                            Preferences.class);
-                    startActivity(settingsIntent);
-                    break;
-            }
-            mDrawerLayout.closeDrawers();
-        }
-    }
-
 }
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 574a0ea89a9..78b03448a83 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -41,6 +41,8 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Parcelable;
+import android.preference.PreferenceManager;
+import android.support.design.widget.NavigationView;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -48,6 +50,7 @@
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -167,20 +170,17 @@ protected void onCreate(Bundle savedInstanceState) {
         // Inflate and set the layout view
         setContentView(R.layout.files);
 
-        // Navigation Drawer
-        initDrawer();
+        // setup toolbar
+        setupToolbar();
+
+        // setup drawer
+        setupDrawer(R.id.nav_all_files);
 
         mDualPane = getResources().getBoolean(R.bool.large_land_layout);
         mLeftFragmentContainer = findViewById(R.id.left_fragment_container);
         mRightFragmentContainer = findViewById(R.id.right_fragment_container);
 
         // Action bar setup
-        getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS,
-        // according to the official
-        // documentation
-
-        // enable ActionBar app icon to behave as action to toggle nav drawer
-        //getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
 
         // Init Fragment without UI to retain AsyncTask across configuration changes
@@ -239,8 +239,7 @@ public void onRequestPermissionsResult(int requestCode,
                 if (grantResults.length > 0
                         && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     // permission was granted
-                    startSynchronization();
-                    // toggle on is save since this is the only scenario this code gets accessed
+                    startSyncFolderOperation(getFile(), false);
                 } else {
                     // permission denied --> do nothing
                 }
@@ -302,7 +301,7 @@ protected void onAccountSet(boolean stateWasRecovered) {
             setFile(file);
 
             if (mAccountWasSet) {
-                setUsernameInDrawer(findViewById(R.id.left_drawer), getAccount());
+                setAccountInDrawer(getAccount());
             }
 
             if (!stateWasRecovered) {
@@ -486,7 +485,7 @@ protected void refreshListOfFilesFragment(boolean reloadData) {
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        boolean drawerOpen = mDrawerLayout.isDrawerOpen(GravityCompat.START);
+        boolean drawerOpen = isDrawerOpen();
         menu.findItem(R.id.action_sort).setVisible(!drawerOpen);
         menu.findItem(R.id.action_sync_account).setVisible(!drawerOpen);
         menu.findItem(R.id.action_switch_view).setVisible(!drawerOpen);
@@ -500,7 +499,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
         // Prevent tapjacking
         View actionBarView = findViewById(R.id.action_bar);
-        actionBarView.setFilterTouchesWhenObscured(true);
+        if (actionBarView != null) {
+            actionBarView.setFilterTouchesWhenObscured(true);
+        }
 
         inflater.inflate(R.menu.main_menu, menu);
         menu.findItem(R.id.action_create_dir).setVisible(false);
@@ -519,14 +520,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case android.R.id.home: {
                 FileFragment second = getSecondFragment();
                 OCFile currentDir = getCurrentDir();
-                if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
-                    mDrawerLayout.closeDrawer(GravityCompat.START);
+                if (isDrawerOpen()) {
+                    closeDrawer();
                 } else if ((currentDir != null && currentDir.getParentId() != 0) ||
                         (second != null && second.getFile() != null)) {
                     onBackPressed();
 
                 } else {
-                    mDrawerLayout.openDrawer(GravityCompat.START);
+                    openDrawer();
                 }
                 break;
             }
@@ -808,8 +809,6 @@ protected void onSaveInstanceState(Bundle outState) {
     protected void onResume() {
         Log_OC.v(TAG, "onResume() start");
         super.onResume();
-        // refresh Navigation Drawer account list
-        mNavigationDrawerAdapter.updateAccountList();
 
         // refresh list of files
         refreshListOfFilesFragment(true);
@@ -965,7 +964,7 @@ public void onReceive(Context context, Intent intent) {
                             }
 
                             if (synchFolderRemotePath.equals(OCFile.ROOT_PATH)) {
-                                setUsernameInDrawer(mDrawerLayout, getAccount());
+                                setAccountInDrawer(getAccount());
                             }
                         }
 
@@ -976,9 +975,9 @@ public void onReceive(Context context, Intent intent) {
                     if (fileListFragment != null) {
                         fileListFragment.setProgressBarAsIndeterminate(mSyncInProgress);
                     }
+                    Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
 
                     setBackgroundText();
-
                 }
 
                 if (synchResult != null) {
@@ -1284,6 +1283,9 @@ public void showDetails(OCFile file) {
 
     @Override
     protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
+        if (chosenFile == null) {
+            chosenFile = getFile();     // if no file is passed, current file decides
+        }
         if (mDualPane) {
             // in dual pane mode, keep the focus of title an action bar in the current folder
             super.updateActionBarTitleAndHomeButton(getCurrentDir());
diff --git a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
index 1b65bdc3ef8..8a3fbcacbed 100644
--- a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
+++ b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
@@ -38,7 +38,6 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.owncloud.android.R;
@@ -74,8 +73,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
 
     protected Button mCancelBtn;
     protected Button mChooseBtn;
-    private ProgressBar mProgressBar;
-
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -93,17 +90,9 @@ protected void onCreate(Bundle savedInstanceState) {
         initControls();
 
         // Action bar setup
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayShowTitleEnabled(true);
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
-
-        mProgressBar = (ProgressBar) findViewById(R.id.progressBar);
-        mProgressBar.setIndeterminateDrawable(
-                getResources().getDrawable(
-                        R.drawable.actionbar_progress_indeterminate_horizontal));
-        mProgressBar.setIndeterminate(mSyncInProgress);
-        // always AFTER setContentView(...) ; to work around bug in its implementation
-        
+        setupToolbar();
+        getSupportActionBar().setDisplayShowTitleEnabled(true);
+
         // sets message for empty list of folders
         setBackgroundText();
 
@@ -214,7 +203,10 @@ public void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {
                                                                       );
         synchFolderOp.execute(getAccount(), this, null, null);
 
-        mProgressBar.setIndeterminate(true);
+        OCFileListFragment fileListFragment = getListOfFilesFragment();
+        if (fileListFragment != null) {
+            fileListFragment.setProgressBarAsIndeterminate(true);
+        }
 
         setBackgroundText();
     }
@@ -495,7 +487,10 @@ public void onReceive(Context context, Intent intent) {
                     removeStickyBroadcast(intent);
                     Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
 
-                    mProgressBar.setIndeterminate(mSyncInProgress);
+                    OCFileListFragment fileListFragment = getListOfFilesFragment();
+                    if (fileListFragment != null) {
+                        fileListFragment.setProgressBarAsIndeterminate(mSyncInProgress);
+                    }
 
                     setBackgroundText();
                 }
diff --git a/src/com/owncloud/android/ui/activity/LocalFolderPickerActivity.java b/src/com/owncloud/android/ui/activity/LocalFolderPickerActivity.java
index 6cfa71732ad..0d70f7a8672 100644
--- a/src/com/owncloud/android/ui/activity/LocalFolderPickerActivity.java
+++ b/src/com/owncloud/android/ui/activity/LocalFolderPickerActivity.java
@@ -43,7 +43,7 @@
  * Displays local folders and let the user choose one of them, which path is set as result.
  */
 
-public class LocalFolderPickerActivity extends AppCompatActivity implements LocalFileListFragment.ContainerActivity {
+public class LocalFolderPickerActivity extends ToolbarActivity implements LocalFileListFragment.ContainerActivity {
 
     private static final String TAG = LocalFolderPickerActivity.class.getName();
 
@@ -122,6 +122,8 @@ public void onClick(View view) {
             }
         });
 
+        // init toolbar
+        setupToolbar();
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayShowTitleEnabled(true);
diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
index 55f30e82687..e9dcb2b9431 100644
--- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
@@ -50,7 +50,7 @@
 import com.owncloud.android.utils.FileStorageUtils;
 
 
-public class LogHistoryActivity extends AppCompatActivity {
+public class LogHistoryActivity extends ToolbarActivity {
 
     private static final String MAIL_ATTACHMENT_TYPE = "text/plain";
 
@@ -70,6 +70,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.log_send_file);
+        setupToolbar();
+
         setTitle(getText(R.string.actionbar_logger));
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
@@ -252,9 +254,7 @@ private String readLogFile() {
      */
     public void showLoadingDialog() {
         // Construct dialog
-        LoadingDialog loading = new LoadingDialog(
-                getResources().getString(R.string.log_progress_dialog_text)
-        );
+        LoadingDialog loading = LoadingDialog.newInstance(R.string.log_progress_dialog_text, false);
         FragmentManager fm = getSupportFragmentManager();
         FragmentTransaction ft = fm.beginTransaction();
         loading.show(ft, DIALOG_WAIT_TAG);
diff --git a/src/com/owncloud/android/ui/activity/ManageAccountsActivity.java b/src/com/owncloud/android/ui/activity/ManageAccountsActivity.java
new file mode 100644
index 00000000000..efd81749aaa
--- /dev/null
+++ b/src/com/owncloud/android/ui/activity/ManageAccountsActivity.java
@@ -0,0 +1,423 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Andy Scherzinger
+ * Copyright (C) 2016 ownCloud GmbH.
+ * <p/>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ * <p/>
+ * This program 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.
+ * <p/>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.ui.activity;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
+import android.accounts.OperationCanceledException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.graphics.drawable.DrawableCompat;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AuthenticatorActivity;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.services.OperationsService;
+import com.owncloud.android.ui.adapter.AccountListAdapter;
+import com.owncloud.android.ui.adapter.AccountListItem;
+import com.owncloud.android.ui.dialog.RemoveAccountDialogFragment;
+import com.owncloud.android.ui.helpers.FileOperationsHelper;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * An Activity that allows the user to manage accounts.
+ */
+public class ManageAccountsActivity extends FileActivity
+    implements
+        AccountListAdapter.AccountListAdapterListener,
+        AccountManagerCallback<Boolean>,
+        ComponentsGetter {
+
+    private static final String TAG = ManageAccountsActivity.class.getSimpleName();
+    public static final String KEY_ACCOUNT_LIST_CHANGED = "ACCOUNT_LIST_CHANGED";
+    public static final String KEY_CURRENT_ACCOUNT_CHANGED = "CURRENT_ACCOUNT_CHANGED";
+
+    private ListView mListView;
+    private final Handler mHandler = new Handler();
+    private String mAccountBeingRemoved;
+    private AccountListAdapter mAccountListAdapter;
+    protected FileUploader.FileUploaderBinder mUploaderBinder = null;
+    protected FileDownloader.FileDownloaderBinder mDownloaderBinder = null;
+    private ServiceConnection mDownloadServiceConnection, mUploadServiceConnection = null;
+    Set<String> mOriginalAccounts;
+    String mOriginalCurrentAccount;
+    private Drawable mTintedCheck;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mTintedCheck = ContextCompat.getDrawable(this, R.drawable.ic_current_white);
+        mTintedCheck = DrawableCompat.wrap(mTintedCheck);
+        int tint = ContextCompat.getColor(this, R.color.actionbar_start_color);
+        DrawableCompat.setTint(mTintedCheck, tint);
+
+        setContentView(R.layout.accounts_layout);
+
+        mListView = (ListView) findViewById(R.id.account_list);
+        mListView.setFilterTouchesWhenObscured(true);
+
+        setupToolbar();
+        updateActionBarTitleAndHomeButtonByString(getResources().getString(R.string.prefs_manage_accounts));
+
+        Account[] accountList = AccountManager.get(this).getAccountsByType(MainApp.getAccountType());
+        mOriginalAccounts = toAccountNameSet(accountList);
+        mOriginalCurrentAccount = AccountUtils.getCurrentOwnCloudAccount(this).name;
+
+        setAccount(AccountUtils.getCurrentOwnCloudAccount(this));
+        onAccountSet(false);
+
+        initializeComponentGetters();
+
+        // added click listener to switch account
+        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                switchAccount(position);
+            }
+        });
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mAccountListAdapter = new AccountListAdapter(this, getAccountListItems(), mTintedCheck);
+        mListView.setAdapter(mAccountListAdapter);
+    }
+
+    /**
+     * converts an array of accounts into a set of account names.
+     *
+     * @param accountList the account array
+     * @return set of account names
+     */
+    private Set<String> toAccountNameSet(Account[] accountList) {
+        Set<String> actualAccounts = new HashSet<String>(accountList.length);
+        for (Account account : accountList) {
+            actualAccounts.add(account.name);
+        }
+        return actualAccounts;
+    }
+
+    @Override
+    public void onBackPressed() {
+        Intent resultIntent = new Intent();
+        resultIntent.putExtra(KEY_ACCOUNT_LIST_CHANGED, hasAccountListChanged());
+        resultIntent.putExtra(KEY_CURRENT_ACCOUNT_CHANGED, hasCurrentAccountChanged());
+        setResult(RESULT_OK, resultIntent);
+
+        finish();
+        super.onBackPressed();
+    }
+
+    /**
+     * checks the set of actual accounts against the set of original accounts when the activity has been started.
+     *
+     * @return <code>true</code> if aacount list has changed, <code>false</code> if not
+     */
+    private boolean hasAccountListChanged() {
+        Account[] accountList = AccountManager.get(this).getAccountsByType(MainApp.getAccountType());
+        Set<String> actualAccounts = toAccountNameSet(accountList);
+        return !mOriginalAccounts.equals(actualAccounts);
+    }
+
+    /**
+     * checks actual current account against current accounts when the activity has been started.
+     *
+     * @return <code>true</code> if aacount list has changed, <code>false</code> if not
+     */
+    private boolean hasCurrentAccountChanged() {
+        Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(this);
+        return (currentAccount != null && !mOriginalCurrentAccount.equals(currentAccount.name));
+    }
+
+    /**
+     * Initialize ComponentsGetters.
+     */
+    private void initializeComponentGetters() {
+        mDownloadServiceConnection = newTransferenceServiceConnection();
+        if (mDownloadServiceConnection != null) {
+            bindService(new Intent(this, FileDownloader.class), mDownloadServiceConnection,
+                    Context.BIND_AUTO_CREATE);
+        }
+        mUploadServiceConnection = newTransferenceServiceConnection();
+        if (mUploadServiceConnection != null) {
+            bindService(new Intent(this, FileUploader.class), mUploadServiceConnection,
+                    Context.BIND_AUTO_CREATE);
+        }
+    }
+
+    /**
+     * creates the account list items list including the add-account action in case multiaccount_support is enabled.
+     *
+     * @return list of account list items
+     */
+    private ArrayList<AccountListItem> getAccountListItems() {
+        Account[] accountList = AccountManager.get(this).getAccountsByType(MainApp.getAccountType());
+        ArrayList<AccountListItem> adapterAccountList = new ArrayList<AccountListItem>(accountList.length);
+        for (Account account : accountList) {
+            adapterAccountList.add(new AccountListItem(account));
+        }
+
+        // Add Create Account item at the end of account list if multi-account is enabled
+        if (getResources().getBoolean(R.bool.multiaccount_support)) {
+            adapterAccountList.add(new AccountListItem());
+        }
+
+        return adapterAccountList;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        boolean retval = true;
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                break;
+            default:
+                retval = super.onOptionsItemSelected(item);
+        }
+        return retval;
+    }
+
+    @Override
+    public void removeAccount(Account account) {
+        mAccountBeingRemoved = account.name;
+        RemoveAccountDialogFragment dialog = RemoveAccountDialogFragment.newInstance(
+            account
+        );
+        dialog.show(getSupportFragmentManager(), RemoveAccountDialogFragment.FTAG_CONFIRMATION);
+    }
+
+    @Override
+    public void changePasswordOfAccount(Account account) {
+        Intent updateAccountCredentials = new Intent(ManageAccountsActivity.this, AuthenticatorActivity.class);
+        updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, account);
+        updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACTION,
+                AuthenticatorActivity.ACTION_UPDATE_TOKEN);
+        startActivity(updateAccountCredentials);
+    }
+
+    @Override
+    public void createAccount() {
+        AccountManager am = AccountManager.get(getApplicationContext());
+        am.addAccount(MainApp.getAccountType(),
+                null,
+                null,
+                null,
+                this,
+                new AccountManagerCallback<Bundle>() {
+                    @Override
+                    public void run(AccountManagerFuture<Bundle> future) {
+                        if (future != null) {
+                            try {
+                                Bundle result = future.getResult();
+                                String name = result.getString(AccountManager.KEY_ACCOUNT_NAME);
+                                AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), name);
+                                mAccountListAdapter = new AccountListAdapter(
+                                    ManageAccountsActivity.this,
+                                    getAccountListItems(),
+                                    mTintedCheck
+                                );
+                                mListView.setAdapter(mAccountListAdapter);
+                                runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        mAccountListAdapter.notifyDataSetChanged();
+                                    }
+                                });
+                            } catch (OperationCanceledException e) {
+                                Log_OC.d(TAG, "Account creation canceled");
+                            } catch (Exception e) {
+                                Log_OC.e(TAG, "Account creation finished in exception: ", e);
+                            }
+                        }
+                    }
+                }, mHandler);
+    }
+
+    /**
+     * Callback executed after the {@link AccountManager} removed an account
+     *
+     * @param future    Result of the removal; future.getResult() is true if account was removed correctly.
+     */
+    @Override
+    public void run(AccountManagerFuture<Boolean> future) {
+        if (future != null && future.isDone()) {
+            Account account = new Account(mAccountBeingRemoved, MainApp.getAccountType());
+            if (!AccountUtils.exists(account, MainApp.getAppContext())) {
+                // Cancel transfers of the removed account
+                if (mUploaderBinder != null) {
+                    mUploaderBinder.cancel(account);
+                }
+                if (mDownloaderBinder != null) {
+                    mDownloaderBinder.cancel(account);
+                }
+            }
+
+            mAccountListAdapter = new AccountListAdapter(this, getAccountListItems(), mTintedCheck);
+            mListView.setAdapter(mAccountListAdapter);
+
+            AccountManager am = AccountManager.get(this);
+            if (am.getAccountsByType(MainApp.getAccountType()).length == 0) {
+                // Show create account screen if there isn't any account
+                am.addAccount(
+                    MainApp.getAccountType(),
+                    null, null, null,
+                    this,
+                    null, null
+                );
+            } else {    // at least one account left
+                if (AccountUtils.getCurrentOwnCloudAccount(this) == null) {
+                    // current account was removed - set another as current
+                    String accountName = "";
+                    Account[] accounts = AccountManager.get(this).getAccountsByType(MainApp.getAccountType());
+                    if (accounts.length != 0) {
+                        accountName = accounts[0].name;
+                    }
+                    AccountUtils.setCurrentOwnCloudAccount(this, accountName);
+                }
+            }
+
+        }
+    }
+
+    /**
+     * Switch current account to that contained in the received position of the list adapter.
+     *
+     * @param position  A position of the account adapter containing an account.
+     */
+    private void switchAccount(int position) {
+        Account clickedAccount = mAccountListAdapter.getItem(position).getAccount();
+        if (getAccount().name.equals(clickedAccount.name)) {
+            // current account selected, just go back
+            finish();
+        } else {
+            // restart list of files with new account
+            AccountUtils.setCurrentOwnCloudAccount(
+                ManageAccountsActivity.this,
+                clickedAccount.name
+            );
+            Intent i = new Intent(
+                ManageAccountsActivity.this,
+                FileDisplayActivity.class
+            );
+            i.putExtra(FileActivity.EXTRA_ACCOUNT, clickedAccount);
+            i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(i);
+        }
+
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        if (mDownloadServiceConnection != null) {
+            unbindService(mDownloadServiceConnection);
+            mDownloadServiceConnection = null;
+        }
+        if (mUploadServiceConnection != null) {
+            unbindService(mUploadServiceConnection);
+            mUploadServiceConnection = null;
+        }
+
+        super.onDestroy();
+    }
+
+    // Methods for ComponentsGetter
+    @Override
+    public FileDownloader.FileDownloaderBinder getFileDownloaderBinder() {
+        return mDownloaderBinder;
+    }
+
+    @Override
+    public FileUploader.FileUploaderBinder getFileUploaderBinder() {
+        return mUploaderBinder;
+    }
+
+    @Override
+    public OperationsService.OperationsServiceBinder getOperationsServiceBinder() {
+        return null;
+    }
+
+    @Override
+    public FileDataStorageManager getStorageManager() {
+        return super.getStorageManager();
+    }
+
+    @Override
+    public FileOperationsHelper getFileOperationsHelper() {
+        return null;
+    }
+
+    protected ServiceConnection newTransferenceServiceConnection() {
+        return new ManageAccountsServiceConnection();
+    }
+
+    /**
+     * Defines callbacks for service binding, passed to bindService()
+     */
+    private class ManageAccountsServiceConnection implements ServiceConnection {
+
+        @Override
+        public void onServiceConnected(ComponentName component, IBinder service) {
+
+            if (component.equals(new ComponentName(ManageAccountsActivity.this, FileDownloader.class))) {
+                mDownloaderBinder = (FileDownloader.FileDownloaderBinder) service;
+
+            } else if (component.equals(new ComponentName(ManageAccountsActivity.this, FileUploader.class))) {
+                Log_OC.d(TAG, "Upload service connected");
+                mUploaderBinder = (FileUploader.FileUploaderBinder) service;
+            }
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName component) {
+            if (component.equals(new ComponentName(ManageAccountsActivity.this, FileDownloader.class))) {
+                Log_OC.d(TAG, "Download service suddenly disconnected");
+                mDownloaderBinder = null;
+            } else if (component.equals(new ComponentName(ManageAccountsActivity.this, FileUploader.class))) {
+                Log_OC.d(TAG, "Upload service suddenly disconnected");
+                mUploaderBinder = null;
+            }
+        }
+    }
+}
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 615978e0c67..0e80b409c4c 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -22,13 +22,7 @@
 package com.owncloud.android.ui.activity;
 
 import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerCallback;
-import android.accounts.AccountManagerFuture;
-import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -36,8 +30,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
@@ -48,39 +40,22 @@
 import android.support.annotation.LayoutRes;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.Toolbar;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
-import android.widget.ListView;
 import android.widget.Toast;
 
 import com.owncloud.android.BuildConfig;
-import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.PreferenceManager.InstantUploadsConfiguration;
-import com.owncloud.android.ui.helpers.FileOperationsHelper;
-import com.owncloud.android.files.services.FileDownloader;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.services.observer.FileObserverService;
-import com.owncloud.android.ui.RadioButtonPreference;
 import com.owncloud.android.utils.DisplayUtils;
 
 import java.io.File;
@@ -92,12 +67,10 @@
  * It proxies the necessary calls via {@link android.support.v7.app.AppCompatDelegate} to be used
  * with AppCompat.
  */
-public class Preferences extends PreferenceActivity
-        implements AccountManagerCallback<Boolean>, ComponentsGetter {
+public class Preferences extends PreferenceActivity {
     
     private static final String TAG = Preferences.class.getSimpleName();
 
-
     private static final int ACTION_SELECT_UPLOAD_PATH = 1;
     private static final int ACTION_SELECT_UPLOAD_VIDEO_PATH = 2;
     private static final int ACTION_SELECT_SOURCE_PATH = 3;
@@ -109,9 +82,6 @@ public class Preferences extends PreferenceActivity
     private AppCompatDelegate mDelegate;
 
     private PreferenceCategory mAccountsPrefCategory = null;
-    private final Handler mHandler = new Handler();
-    private String mAccountName;
-    private boolean mShowContextMenu = false;
 
     private String mUploadPath;
     private String mUploadVideoPath;
@@ -127,11 +97,6 @@ public class Preferences extends PreferenceActivity
     private Preference mPrefInstantUploadSourcePath;
     private Preference mPrefInstantUploadBehaviour;
 
-    protected FileDownloader.FileDownloaderBinder mDownloaderBinder = null;
-    protected FileUploader.FileUploaderBinder mUploaderBinder = null;
-    private ServiceConnection mDownloadServiceConnection, mUploadServiceConnection = null;
-
-
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -152,73 +117,6 @@ public void onCreate(Bundle savedInstanceState) {
                     setContentDescription(getString(R.string.actionbar_settings));
         }
 
-        // Load the accounts category for adding the list of accounts
-        mAccountsPrefCategory = (PreferenceCategory) findPreference("accounts_category");
-
-        ListView listView = getListView();
-        listView.setFilterTouchesWhenObscured(true);
-        listView.setOnItemLongClickListener(new OnItemLongClickListener() {
-            @Override
-            public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-                ListView listView = (ListView) parent;
-                ListAdapter listAdapter = listView.getAdapter();
-                Object obj = listAdapter.getItem(position);
-
-                if (obj != null && obj instanceof RadioButtonPreference) {
-                    mShowContextMenu = true;
-                    mAccountName = ((RadioButtonPreference) obj).getKey();
-
-                    String[] items = {
-                            getResources().getString(R.string.change_password),
-                            getResources().getString(R.string.delete_account)
-                    };
-                    final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(Preferences.this);
-                    View convertView = getLayoutInflater().inflate(R.layout.alert_dialog_list_view, null);
-                    alertDialogBuilder.setView(convertView);
-                    ListView lv = (ListView) convertView.findViewById(R.id.list);
-                    ArrayAdapter<String> adapter = new ArrayAdapter<String>(
-                            Preferences.this,R.layout.simple_dialog_list_item,items);
-                    lv.setAdapter(adapter);
-
-                    //Setup proper inline listener
-                    final AlertDialog alertDialog = alertDialogBuilder.create();
-                    lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                        @Override
-                        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                            AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
-                            Account accounts[] = am.getAccountsByType(MainApp.getAccountType());
-                            for (Account a : accounts) {
-                                if (a.name.equals(mAccountName)) {
-                                    if (position==0) {
-
-                                        // Change account password
-                                        Intent updateAccountCredentials = new Intent(Preferences.this, AuthenticatorActivity.class);
-                                        updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, a);
-                                        updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACTION,
-                                                AuthenticatorActivity.ACTION_UPDATE_TOKEN);
-                                        startActivity(updateAccountCredentials);
-                                        alertDialog.cancel();
-                                        
-                                    } else if (position==1) {
-
-                                        // Remove account
-                                        am.removeAccount(a, Preferences.this, mHandler);
-                                        Log_OC.d(TAG, "Remove an account " + a.name);
-                                        alertDialog.cancel();
-                                    }
-                                }
-                            }
-                        }
-                    });
-                    alertDialog.show();
-
-                    View.OnLongClickListener longListener = (View.OnLongClickListener) obj;
-                    return longListener.onLongClick(view);
-                }
-                return false;
-            }
-        });
-        
         // Load package info
         String temp;
         try {
@@ -242,22 +140,19 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                     Boolean incoming = (Boolean) newValue;
 
                     i.setAction(
-                            incoming.booleanValue() ? PassCodeActivity.ACTION_REQUEST_WITH_RESULT :
+                            incoming ? PassCodeActivity.ACTION_REQUEST_WITH_RESULT :
                                     PassCodeActivity.ACTION_CHECK_WITH_RESULT
                     );
 
-                    startActivityForResult(i, incoming.booleanValue() ? ACTION_REQUEST_PASSCODE :
+                    startActivityForResult(i, incoming ? ACTION_REQUEST_PASSCODE :
                             ACTION_CONFIRM_PASSCODE);
 
                     // Don't update just yet, we will decide on it in onActivityResult
                     return false;
                 }
             });
-            
         }
 
-
-
         PreferenceCategory preferenceCategory = (PreferenceCategory) findPreference("more");
         
         boolean helpEnabled = getResources().getBoolean(R.bool.help_enabled);
@@ -279,7 +174,6 @@ public boolean onPreferenceClick(Preference preference) {
             } else {
                 preferenceCategory.removePreference(pHelp);
             }
-            
         }
         
        boolean recommendEnabled = getResources().getBoolean(R.bool.recommend_enabled);
@@ -315,7 +209,6 @@ public boolean onPreferenceClick(Preference preference) {
             } else {
                 preferenceCategory.removePreference(pRecommend);
             }
-            
         }
         
         boolean feedbackEnabled = getResources().getBoolean(R.bool.feedback_enabled);
@@ -483,29 +376,19 @@ public boolean onPreferenceClick(Preference preference) {
                 ((CheckBoxPreference)mPrefInstantUpload).isChecked());
 
         /* About App */
-        pAboutApp = (Preference) findPreference("about_app");
-        if (pAboutApp != null) {
-            pAboutApp.setTitle(String.format(getString(R.string.about_android),
-            getString(R.string.app_name)));
-            pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));
-        }
+       pAboutApp = (Preference) findPreference("about_app");
+       if (pAboutApp != null) { 
+           pAboutApp.setTitle(String.format(
+               getString(R.string.about_android),
+               getString(R.string.app_name)
+           ));
+           pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));
+       }
 
         loadInstantUploadPath();
         loadInstantUploadVideoPath();
         loadInstantUploadSourcePath();
 
-        /* ComponentsGetter */
-        mDownloadServiceConnection = newTransferenceServiceConnection();
-        if (mDownloadServiceConnection != null) {
-            bindService(new Intent(this, FileDownloader.class), mDownloadServiceConnection,
-                    Context.BIND_AUTO_CREATE);
-        }
-        mUploadServiceConnection = newTransferenceServiceConnection();
-        if (mUploadServiceConnection != null) {
-            bindService(new Intent(this, FileUploader.class), mUploadServiceConnection,
-                    Context.BIND_AUTO_CREATE);
-        }
-
     }
     
     private void toggleInstantPictureOptions(Boolean value){
@@ -538,46 +421,6 @@ private void toggleInstantUploadCommonOptions(Boolean video, Boolean picture){
         }
     }
 
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-
-        // Filter for only showing contextual menu when long press on the
-        // accounts
-        if (mShowContextMenu) {
-            getMenuInflater().inflate(R.menu.account_picker_long_click, menu);
-            mShowContextMenu = false;
-        }
-        super.onCreateContextMenu(menu, v, menuInfo);
-    }
-
-    @Override
-    public void run(AccountManagerFuture<Boolean> future) {
-        if (future.isDone()) {
-            // after remove account
-            Account account = new Account(mAccountName, MainApp.getAccountType());
-            if (!AccountUtils.exists(account, MainApp.getAppContext())) {
-                // Cancel tranfers
-                if (mUploaderBinder != null) {
-                    mUploaderBinder.cancel(account);
-                }
-                if (mDownloaderBinder != null) {
-                    mDownloaderBinder.cancel(account);
-                }
-            }
-
-            Account a = AccountUtils.getCurrentOwnCloudAccount(this);
-            String accountName = "";
-            if (a == null) {
-                Account[] accounts = AccountManager.get(this)
-                        .getAccountsByType(MainApp.getAccountType());
-                if (accounts.length != 0)
-                    accountName = accounts[0].name;
-                AccountUtils.setCurrentOwnCloudAccount(this, accountName);
-            }
-            addAccountsCheckboxPreferences();
-        }
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -585,9 +428,6 @@ protected void onResume() {
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         boolean state = appPrefs.getBoolean(PassCodeActivity.PREFERENCE_SET_PASSCODE, false);
         pCode.setChecked(state);
-
-        // Populate the accounts category with the list of accounts
-        addAccountsCheckboxPreferences();
     }
 
     @Override
@@ -729,15 +569,6 @@ protected void onPostCreate(Bundle savedInstanceState) {
 
     @Override
     protected void onDestroy() {
-        if (mDownloadServiceConnection != null) {
-            unbindService(mDownloadServiceConnection);
-            mDownloadServiceConnection = null;
-        }
-        if (mUploadServiceConnection != null) {
-            unbindService(mUploadServiceConnection);
-            mUploadServiceConnection = null;
-        }
-
         super.onDestroy();
         getDelegate().onDestroy();
     }
@@ -761,124 +592,6 @@ private AppCompatDelegate getDelegate() {
         return mDelegate;
     }
 
-    /**
-     * Create the list of accounts that has been added into the app
-     */
-    @SuppressWarnings("deprecation")
-    private void addAccountsCheckboxPreferences() {
-
-        // Remove accounts in case list is refreshing for avoiding to have
-        // duplicate items
-        if (mAccountsPrefCategory.getPreferenceCount() > 0) {
-            mAccountsPrefCategory.removeAll();
-        }
-
-        AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
-        Account accounts[] = am.getAccountsByType(MainApp.getAccountType());
-        Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
-
-        if (am.getAccountsByType(MainApp.getAccountType()).length == 0) {
-            // Show create account screen if there isn't any account
-            am.addAccount(MainApp.getAccountType(), null, null, null, this,
-                    null,
-                    null);
-        }
-        else {
-            OwnCloudAccount oca;
-            for (Account a : accounts) {
-                RadioButtonPreference accountPreference = new RadioButtonPreference(this);
-                accountPreference.setKey(a.name);
-                try {
-                    oca = new OwnCloudAccount(a, this);
-                    accountPreference.setTitle(
-                        oca.getDisplayName() + " @ " +
-                        DisplayUtils.convertIdn(a.name.substring(a.name.lastIndexOf("@") + 1), false)
-                    );
-                } catch (Exception e) {
-                    Log_OC.w(
-                        TAG,
-                        "Account not found right after being read :\\ ; using account name instead of display name"
-                    );
-                    // Handle internationalized domain names
-                    accountPreference.setTitle(DisplayUtils.convertIdn(a.name, false));
-                }
-                mAccountsPrefCategory.addPreference(accountPreference);
-
-                // Check the current account that is being used
-                if (a.name.equals(currentAccount.name)) {
-                    accountPreference.setChecked(true);
-                } else {
-                    accountPreference.setChecked(false);
-                }
-
-                accountPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-                    @Override
-                    public boolean onPreferenceChange(Preference preference, Object newValue) {
-                        String key = preference.getKey();
-                        AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
-                        Account accounts[] = am.getAccountsByType(MainApp.getAccountType());
-                        for (Account a : accounts) {
-                            RadioButtonPreference p =
-                                    (RadioButtonPreference) findPreference(a.name);
-                            if (key.equals(a.name)) {
-                                boolean accountChanged = !p.isChecked(); 
-                                p.setChecked(true);
-                                AccountUtils.setCurrentOwnCloudAccount(
-                                        getApplicationContext(),
-                                        a.name
-                                );
-                                if (accountChanged) {
-                                    // restart the main activity
-                                    Intent i = new Intent(
-                                            Preferences.this, 
-                                            FileDisplayActivity.class
-                                    );
-                                    i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                                    i.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-                                    startActivity(i);
-                                } else {
-                                    finish();
-                                }
-                            } else {
-                                p.setChecked(false);
-                            }
-                        }
-                        return (Boolean) newValue;
-                    }
-                });
-
-            }
-
-            // Add Create Account preference at the end of account list if
-            // Multiaccount is enabled
-            if (getResources().getBoolean(R.bool.multiaccount_support)) {
-                createAddAccountPreference();
-            }
-
-        }
-    }
-
-    /**
-     * Create the preference for allow adding new accounts
-     */
-    private void createAddAccountPreference() {
-        Preference addAccountPref = new Preference(this);
-        addAccountPref.setKey("add_account");
-        addAccountPref.setTitle(getString(R.string.prefs_add_account));
-        mAccountsPrefCategory.addPreference(addAccountPref);
-
-        addAccountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                AccountManager am = AccountManager.get(getApplicationContext());
-                am.addAccount(MainApp.getAccountType(), null, null, null, Preferences.this,
-                        null, null);
-                return true;
-            }
-        });
-
-    }
-
     /**
      * Load upload path set on preferences
      */
@@ -962,66 +675,4 @@ private void saveInstantUploadSourcePathOnPreferences() {
         editor.commit();
     }
 
-    // Methods for ComponetsGetter
-    @Override
-    public FileDownloader.FileDownloaderBinder getFileDownloaderBinder() {
-        return mDownloaderBinder;
-    }
-
-
-    @Override
-    public FileUploader.FileUploaderBinder getFileUploaderBinder() {
-        return mUploaderBinder;
-    }
-
-    @Override
-    public OperationsService.OperationsServiceBinder getOperationsServiceBinder() {
-        return null;
-    }
-
-    @Override
-    public FileDataStorageManager getStorageManager() {
-        return null;
-    }
-
-    @Override
-    public FileOperationsHelper getFileOperationsHelper() {
-        return null;
-    }
-
-    protected ServiceConnection newTransferenceServiceConnection() {
-        return new PreferencesServiceConnection();
-    }
-
-    /** Defines callbacks for service binding, passed to bindService() */
-    private class PreferencesServiceConnection implements ServiceConnection {
-
-        @Override
-        public void onServiceConnected(ComponentName component, IBinder service) {
-
-            if (component.equals(new ComponentName(Preferences.this, FileDownloader.class))) {
-                mDownloaderBinder = (FileDownloader.FileDownloaderBinder) service;
-
-            } else if (component.equals(new ComponentName(Preferences.this,
-                    FileUploader.class))) {
-                Log_OC.d(TAG, "Upload service connected");
-                mUploaderBinder = (FileUploader.FileUploaderBinder) service;
-            } else {
-                return;
-            }
-
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName component) {
-            if (component.equals(new ComponentName(Preferences.this, FileDownloader.class))) {
-                Log_OC.d(TAG, "Download service suddenly disconnected");
-                mDownloaderBinder = null;
-            } else if (component.equals(new ComponentName(Preferences.this,
-                    FileUploader.class))) {
-                Log_OC.d(TAG, "Upload service suddenly disconnected");
-                mUploaderBinder = null;
-            }
-        }
-    };
 }
diff --git a/src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 40daf8e39fa..4fb2f15559f 100644
--- a/src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -389,9 +389,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     private void populateDirectoryList() {
         setContentView(R.layout.uploader_layout);
+        setupToolbar();
+        ActionBar actionBar = getSupportActionBar();
 
         ListView mListView = (ListView) findViewById(android.R.id.list);
-        ActionBar actionBar = getSupportActionBar();
 
         String current_dir = mParents.peek();
         if (current_dir.equals("")) {
diff --git a/src/com/owncloud/android/ui/activity/ShareActivity.java b/src/com/owncloud/android/ui/activity/ShareActivity.java
index f1acad55064..679238724ba 100644
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -201,7 +201,7 @@ public void unshareWith(OCShare share) {
     @Override
     public void refreshUsersOrGroupsListFromServer() {
         // Show loading
-        showLoadingDialog(getString(R.string.common_loading));
+        showLoadingDialog(R.string.common_loading);
         // Get Users and Groups
         GetShareWithUsersAsyncTask getTask = new GetShareWithUsersAsyncTask(this);
         Object[] params = {getFile(), getAccount(), getStorageManager()};
diff --git a/src/com/owncloud/android/ui/activity/ToolbarActivity.java b/src/com/owncloud/android/ui/activity/ToolbarActivity.java
new file mode 100644
index 00000000000..31613d108fb
--- /dev/null
+++ b/src/com/owncloud/android/ui/activity/ToolbarActivity.java
@@ -0,0 +1,108 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Andy Scherzinger
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.ui.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+
+/**
+ * Base class providing toolbar registration functionality, see {@link #setupToolbar()}.
+ */
+public abstract class ToolbarActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    /**
+     * Toolbar setup that must be called in implementer's {@link #onCreate} after {@link #setContentView} if they
+     * want to use the toolbar.
+     */
+    protected void setupToolbar() {
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+    }
+
+    /**
+     * Updates title bar and home buttons (state and icon).
+     */
+    protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
+        String title = getString(R.string.default_display_name_for_root_folder);    // default
+        boolean inRoot;
+
+        // choose the appropriate title
+        inRoot = (
+                chosenFile == null ||
+                        (chosenFile.isFolder() && chosenFile.getParentId() == FileDataStorageManager.ROOT_PARENT_ID)
+        );
+        if (!inRoot) {
+            title = chosenFile.getFileName();
+        }
+
+        updateActionBarTitleAndHomeButtonByString(title);
+    }
+
+    /**
+     * Updates title bar and home buttons (state and icon).
+     */
+    protected void updateActionBarTitleAndHomeButtonByString(String title) {
+        String titleToSet = getString(R.string.app_name);    // default
+
+        if (title != null) {
+            titleToSet = title;
+        }
+
+        // set the chosen title
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setTitle(titleToSet);
+
+        // also as content description
+        View actionBarTitleView = getWindow().getDecorView().findViewById(
+                getResources().getIdentifier("action_bar_title", "id", "android")
+        );
+        // TODO remove legacy code
+        if (actionBarTitleView != null) {    // it's null in Android 2.x
+            actionBarTitleView.setContentDescription(titleToSet);
+        }
+
+        // set home button properties
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setDisplayShowTitleEnabled(true);
+    }
+
+    /**
+     * checks if the given file is the root folder.
+     *
+     * @param file file to be checked if it is the root folder
+     * @return <code>true</code> if it is <code>null</code> or the root folder, else returns <code>false</code>
+     */
+    public boolean isRoot(OCFile file) {
+        return file == null ||
+                (file.isFolder() && file.getParentId() == FileDataStorageManager.ROOT_PARENT_ID);
+    }
+
+}
diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 19aaf3757dc..32fa3cb390d 100644
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -44,7 +44,7 @@
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
-import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
+import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.ui.fragment.LocalFileListFragment;
 import com.owncloud.android.utils.FileStorageUtils;
 
@@ -53,9 +53,8 @@
 
 /**
  * Displays local files and let the user choose what of them wants to upload
- * to the current ownCloud account
+ * to the current ownCloud account.
  */
-
 public class UploadFilesActivity extends FileActivity implements
     LocalFileListFragment.ContainerActivity, ActionBar.OnNavigationListener,
         OnClickListener, ConfirmationDialogFragmentListener {
@@ -114,6 +113,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         // Inflate and set the layout view
         setContentView(R.layout.upload_files_layout);
+
         mFileListFragment = (LocalFileListFragment)
                 getSupportFragmentManager().findFragmentById(R.id.local_files_list);
         
@@ -138,7 +138,9 @@ public void onCreate(Bundle savedInstanceState) {
         if (localBehaviour == FileUploader.LOCAL_BEHAVIOUR_COPY){
             mRadioBtnCopyFiles.setChecked(true);
         }
-        
+
+        // setup the toolbar
+        setupToolbar();
             
         // Action bar setup
         ActionBar actionBar = getSupportActionBar();
@@ -342,7 +344,7 @@ private class CheckAvailableSpaceTask extends AsyncTask<Void, Void, Boolean> {
         @Override
         protected void onPreExecute () {
             /// progress dialog and disable 'Move' button
-            mCurrentDialog = IndeterminateProgressDialog.newInstance(R.string.wait_a_moment, false);
+            mCurrentDialog = LoadingDialog.newInstance(R.string.wait_a_moment, false);
             mCurrentDialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);
         }
         
diff --git a/src/com/owncloud/android/ui/activity/UploadListActivity.java b/src/com/owncloud/android/ui/activity/UploadListActivity.java
index 1dbc63c10f0..57aad23987b 100755
--- a/src/com/owncloud/android/ui/activity/UploadListActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -82,20 +82,18 @@ protected void onCreate(Bundle savedInstanceState) {
         // but that's other story
         setFile(null);
 
-        // Navigation Drawer
-        initDrawer();
+        // setup toolbar
+        setupToolbar();
+
+        // setup drawer
+        setupDrawer(R.id.nav_uploads);
 
         // Add fragment with a transaction for setting a tag
         if(savedInstanceState == null) {
             createUploadListFragment();
         } // else, the Fragment Manager makes the job on configuration changes
 
-        // enable ActionBar app icon to behave as action to toggle nav drawer
-        getSupportActionBar().setHomeButtonEnabled(true);
-        mDrawerToggle.setDrawerIndicatorEnabled(true);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setTitle(R.string.uploads_view_title);
-
+        getSupportActionBar().setTitle(getString(R.string.uploads_view_title));
     }
 
     private void createUploadListFragment(){
@@ -186,12 +184,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 (UploadListFragment) getSupportFragmentManager().findFragmentByTag(TAG_UPLOAD_LIST_FRAGMENT);
         switch (item.getItemId()) {
             case android.R.id.home:
-                if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
-                    mDrawerLayout.closeDrawer(GravityCompat.START);
+                if (isDrawerOpen()) {
+                    closeDrawer();
                 } else {
-                    mDrawerLayout.openDrawer(GravityCompat.START);
+                    openDrawer();
                 }
-                break;
             case R.id.action_retry_uploads:
                 FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
                 requester.retryFailedUploads(this, null, null);
@@ -340,7 +337,6 @@ public void onReceive(Context context, Intent intent) {
         }
     }
 
-    @Override
     protected String getDefaultTitle() {
         return getString(R.string.uploads_view_title);
     }
@@ -352,9 +348,9 @@ protected String getDefaultTitle() {
     @Override
     protected void onAccountSet(boolean stateWasRecovered) {
         super.onAccountSet(stateWasRecovered);
-        updateActionBarTitleAndHomeButton(null);
+        getSupportActionBar().setTitle(getString(R.string.uploads_view_title));
         if (mAccountWasSet) {
-            setUsernameInDrawer(findViewById(R.id.left_drawer), getAccount());
+            setAccountInDrawer(getAccount());
         }
     }
 
diff --git a/src/com/owncloud/android/ui/adapter/AccountListAdapter.java b/src/com/owncloud/android/ui/adapter/AccountListAdapter.java
new file mode 100644
index 00000000000..db0cbf96a17
--- /dev/null
+++ b/src/com/owncloud/android/ui/adapter/AccountListAdapter.java
@@ -0,0 +1,187 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Andy Scherzinger
+ * Copyright (C) 2016 ownCloud GmbH.
+ * <p/>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ * <p/>
+ * This program 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.
+ * <p/>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.ui.adapter;
+
+import android.accounts.Account;
+import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.lib.common.OwnCloudAccount;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.ui.activity.BaseActivity;
+import com.owncloud.android.utils.DisplayUtils;
+
+import java.util.List;
+
+/**
+ * This Adapter populates a ListView with all accounts within the app.
+ */
+public class AccountListAdapter extends ArrayAdapter<AccountListItem> {
+    private static final String TAG = AccountListAdapter.class.getSimpleName();
+    private float mAccountAvatarRadiusDimension;
+    private final BaseActivity mContext;
+    private List<AccountListItem> mValues;
+    private AccountListAdapterListener mListener;
+    private Drawable mTintedCheck;
+
+    public AccountListAdapter(BaseActivity context, List<AccountListItem> values, Drawable tintedCheck) {
+        super(context, -1, values);
+        this.mContext = context;
+        this.mValues = values;
+        this.mListener = (AccountListAdapterListener) context;
+        this.mAccountAvatarRadiusDimension = context.getResources().getDimension(R.dimen.list_item_avatar_icon_radius);
+        this.mTintedCheck = tintedCheck;
+    }
+
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+        AccountViewHolderItem viewHolder;
+
+        if (convertView == null) {
+            LayoutInflater inflater = mContext.getLayoutInflater();
+            convertView = inflater.inflate(R.layout.account_item, parent, false);
+
+            viewHolder = new AccountViewHolderItem();
+            viewHolder.imageViewItem = (ImageView) convertView.findViewById(R.id.icon);
+            viewHolder.checkViewItem = (ImageView) convertView.findViewById(R.id.ticker);
+            viewHolder.checkViewItem.setImageDrawable(mTintedCheck);
+            viewHolder.nameViewItem = (TextView) convertView.findViewById(R.id.name);
+            viewHolder.accountViewItem = (TextView) convertView.findViewById(R.id.account);
+            viewHolder.passwordButtonItem = (ImageView) convertView.findViewById(R.id.passwordButton);
+            viewHolder.removeButtonItem = (ImageView) convertView.findViewById(R.id.removeButton);
+
+            convertView.setTag(viewHolder);
+        } else {
+            viewHolder = (AccountViewHolderItem) convertView.getTag();
+        }
+
+        AccountListItem accountListItem = mValues.get(position);
+
+
+        if (accountListItem != null) {
+            // create account item
+            if (AccountListItem.TYPE_ACCOUNT == accountListItem.getType()) {
+                Account account = accountListItem.getAccount();
+                try {
+                    OwnCloudAccount oca = new OwnCloudAccount(account, mContext);
+                    viewHolder.nameViewItem.setText(oca.getDisplayName());
+                } catch (Exception e) {
+                    Log_OC.w(
+                        TAG,
+                        "Account not found right after being read :\\ ; using account name instead of display name"
+                    );
+                    viewHolder.nameViewItem.setText(
+                        AccountUtils.getUsernameOfAccount(account.name)
+                    );
+                }
+                viewHolder.nameViewItem.setTag(account.name);
+
+                viewHolder.accountViewItem.setText(
+                    DisplayUtils.convertIdn(account.name, false)
+                );
+
+                try {
+                    DisplayUtils.showAccountAvatar(
+                        account,
+                        viewHolder.imageViewItem,
+                        mAccountAvatarRadiusDimension,
+                        true
+                    );
+                } catch (Exception e) {
+                    Log_OC.e(TAG, "Error calculating RGB value for account list item.", e);
+                    // use user icon as a fallback
+                    viewHolder.imageViewItem.setImageResource(R.drawable.ic_user);
+                }
+
+                if (AccountUtils.getCurrentOwnCloudAccount(getContext()).name.equals(account.name)) {
+                    viewHolder.checkViewItem.setVisibility(View.VISIBLE);
+                } else {
+                    viewHolder.checkViewItem.setVisibility(View.INVISIBLE);
+                }
+
+                /// bind listener to change password
+                viewHolder.passwordButtonItem.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mListener.changePasswordOfAccount(mValues.get(position).getAccount());
+                    }
+                });
+
+                /// bind listener to remove account
+                viewHolder.removeButtonItem.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mListener.removeAccount(mValues.get(position).getAccount());
+                    }
+                });
+            } // create add account action item
+            else if (AccountListItem.TYPE_ACTION_ADD == accountListItem.getType()) {
+                LayoutInflater inflater = mContext.getLayoutInflater();
+                View actionView = inflater.inflate(R.layout.account_action, parent, false);
+                ((TextView) actionView.findViewById(R.id.name)).setText(R.string.prefs_add_account);
+                ((ImageView) actionView.findViewById(R.id.icon)).setImageResource(R.drawable.ic_account_plus);
+
+                // bind action listener
+                actionView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mListener.createAccount();
+                    }
+                });
+
+                return actionView;
+            }
+        }
+
+        return convertView;
+    }
+
+    /**
+     * Listener interface for Activities using the {@link AccountListAdapter}
+     */
+    public interface AccountListAdapterListener {
+        void removeAccount(Account account);
+
+        void changePasswordOfAccount(Account account);
+
+        void createAccount();
+    }
+
+    /**
+     * Account ViewHolderItem to get smooth scrolling.
+     */
+    static class AccountViewHolderItem {
+        ImageView imageViewItem;
+        ImageView checkViewItem;
+
+        TextView nameViewItem;
+        TextView accountViewItem;
+
+        ImageView passwordButtonItem;
+        ImageView removeButtonItem;
+    }
+}
diff --git a/src/com/owncloud/android/ui/adapter/AccountListItem.java b/src/com/owncloud/android/ui/adapter/AccountListItem.java
new file mode 100644
index 00000000000..cbad54b1cf7
--- /dev/null
+++ b/src/com/owncloud/android/ui/adapter/AccountListItem.java
@@ -0,0 +1,58 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Andy Scherzinger
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.ui.adapter;
+
+import android.accounts.Account;
+
+/**
+ * Container implementation to add {@link Account}s and the add action to the list.
+ */
+public class AccountListItem {
+    public static final int TYPE_ACCOUNT = 0;
+    public static final int TYPE_ACTION_ADD = 1;
+
+    private Account mAccount;
+    private int mType;
+
+    /**
+     * creates an account list item containing an {@link Account}.
+     *
+     * @param account the account
+     */
+    public AccountListItem(Account account) {
+        mAccount = account;
+        mType = TYPE_ACCOUNT;
+    }
+
+    /**
+     * creates an account list item flagged as add-action.
+     */
+    public AccountListItem() {
+        mType = TYPE_ACTION_ADD;
+    }
+
+    public Account getAccount() {
+        return mAccount;
+    }
+
+    public int getType() {
+        return mType;
+    }
+}
diff --git a/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java b/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
index dd08e135227..332ed82b3ba 100755
--- a/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
@@ -409,7 +409,7 @@ public void onClick(View v) {
             fakeFileToCheatThumbnailsCacheManagerInterface.setStoragePath(upload.getLocalPath());
             fakeFileToCheatThumbnailsCacheManagerInterface.setMimetype(upload.getMimeType());
 
-            boolean allowedToCreateNewThumbnail = (ThumbnailsCacheManager.cancelPotentialWork(
+            boolean allowedToCreateNewThumbnail = (ThumbnailsCacheManager.cancelPotentialThumbnailWork(
                     fakeFileToCheatThumbnailsCacheManagerInterface,
                     fileIcon)
             );
@@ -434,8 +434,8 @@ public void onClick(View v) {
                         if (thumbnail == null) {
                             thumbnail = ThumbnailsCacheManager.mDefaultImg;
                         }
-                        final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
-                                new ThumbnailsCacheManager.AsyncDrawable(
+                        final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
+                                new ThumbnailsCacheManager.AsyncThumbnailDrawable(
                                         mParentActivity.getResources(),
                                         thumbnail,
                                         task
@@ -466,8 +466,8 @@ public void onClick(View v) {
                         if (thumbnail == null) {
                             thumbnail = ThumbnailsCacheManager.mDefaultImg;
                         }
-                        final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
-                                new ThumbnailsCacheManager.AsyncDrawable(
+                        final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
+                                new ThumbnailsCacheManager.AsyncThumbnailDrawable(
                                         mParentActivity.getResources(),
                                         thumbnail,
                                         task
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 519d85ca7a5..bc5502ae030 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -306,7 +306,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                         fileIcon.setImageBitmap(thumbnail);
                     } else {
                         // generate new Thumbnail
-                        if (ThumbnailsCacheManager.cancelPotentialWork(file, fileIcon)) {
+                        if (ThumbnailsCacheManager.cancelPotentialThumbnailWork(file, fileIcon)) {
                             final ThumbnailsCacheManager.ThumbnailGenerationTask task =
                                     new ThumbnailsCacheManager.ThumbnailGenerationTask(
                                             fileIcon, mStorageManager, mAccount
@@ -314,11 +314,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
                             if (thumbnail == null) {
                                 thumbnail = ThumbnailsCacheManager.mDefaultImg;
                             }
-                            final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
-                                    new ThumbnailsCacheManager.AsyncDrawable(
-                                            mContext.getResources(),
-                                            thumbnail,
-                                            task
+                            final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
+                                    new ThumbnailsCacheManager.AsyncThumbnailDrawable(
+                                        mContext.getResources(),
+                                        thumbnail,
+                                        task
                                     );
                             fileIcon.setImageDrawable(asyncDrawable);
                             task.execute(file);
diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index b03b03c1742..7ded153cdfd 100644
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -20,10 +20,7 @@
  */
 package com.owncloud.android.ui.adapter;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.util.Arrays;
-import java.util.Comparator;
+import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -43,6 +40,11 @@
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimetypeIconUtil;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.util.Arrays;
+import java.util.Comparator;
+
 /**
  * This Adapter populates a ListView with all files and directories contained
  * in a local directory
@@ -112,9 +114,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
             ImageView fileIcon = (ImageView) view.findViewById(R.id.thumbnail);
 
             /** Cancellation needs do be checked and done before changing the drawable in fileIcon, or
-             * {@link ThumbnailsCacheManager#cancelPotentialWork} will NEVER cancel any task.
+             * {@link ThumbnailsCacheManager#cancelPotentialThumbnailWork} will NEVER cancel any task.
              **/
-            boolean allowedToCreateNewThumbnail = (ThumbnailsCacheManager.cancelPotentialWork(file, fileIcon));
+            boolean allowedToCreateNewThumbnail = (ThumbnailsCacheManager.cancelPotentialThumbnailWork(file, fileIcon));
 
             if (!file.isDirectory()) {
                 fileIcon.setImageResource(R.drawable.file);
@@ -162,9 +164,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
                             final ThumbnailsCacheManager.ThumbnailGenerationTask task =
                                     new ThumbnailsCacheManager.ThumbnailGenerationTask(fileIcon);
                             thumbnail = ThumbnailsCacheManager.mDefaultImg;
-                            final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
-                                new ThumbnailsCacheManager.AsyncDrawable(
-                                    mContext.getResources(), 
+                            final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
+                                new ThumbnailsCacheManager.AsyncThumbnailDrawable(
+                                    mContext.getResources(),
                                     thumbnail, 
                                     task
                                 );
diff --git a/src/com/owncloud/android/ui/adapter/NavigationDrawerListAdapter.java b/src/com/owncloud/android/ui/adapter/NavigationDrawerListAdapter.java
deleted file mode 100644
index 93c1ea79d50..00000000000
--- a/src/com/owncloud/android/ui/adapter/NavigationDrawerListAdapter.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- *   ownCloud Android client application
- *
- *   @author tobiasKaminsky
- *   @author masensio
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.ui.adapter;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.ui.NavigationDrawerItem;
-import com.owncloud.android.ui.activity.FileActivity;
-
-import java.util.ArrayList;
-
-public class NavigationDrawerListAdapter extends BaseAdapter {
-
-    private final static String TAG  = NavigationDrawerListAdapter.class.getSimpleName();
-
-    private Context mContext;
-
-    private ArrayList<NavigationDrawerItem> mNavigationDrawerItems;
-    private ArrayList<Object> mAll = new ArrayList<Object>();
-    private Account[] mAccounts;
-    private boolean mShowAccounts;
-    private Account mCurrentAccount;
-    private FileActivity mFileActivity;
-
-
-    public NavigationDrawerListAdapter(Context context, FileActivity fileActivity,
-                                       ArrayList<NavigationDrawerItem> navigationDrawerItems){
-        mFileActivity = fileActivity;
-        mContext = context;
-        mNavigationDrawerItems = navigationDrawerItems;
-
-        updateAccountList();
-
-        mAll.addAll(mNavigationDrawerItems);
-    }
-
-    public void updateAccountList(){
-        AccountManager am = (AccountManager) mContext.getSystemService(mContext.ACCOUNT_SERVICE);
-        mAccounts = am.getAccountsByType(MainApp.getAccountType());
-        mCurrentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
-    }
-
-    @Override
-    public int getCount() {
-        if (mShowAccounts){
-            return mNavigationDrawerItems.size() + 1;
-        } else {
-            return mNavigationDrawerItems.size();
-        }
-    }
-
-    @Override
-    public Object getItem(int position) {
-        //return all.get(position);
-        return null;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-
-        LayoutInflater inflator = (LayoutInflater) mContext
-                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        if (mAll.size() > position) {
-            // Normal entry
-            if (mAll.get(position) instanceof NavigationDrawerItem){
-                NavigationDrawerItem navItem = (NavigationDrawerItem) mAll.get(position);
-
-                View view = inflator.inflate(R.layout.drawer_list_item, null);
-
-                LinearLayout itemLayout = (LinearLayout) view.findViewById(R.id.itemLayout);
-                itemLayout.setContentDescription(navItem.getContentDescription());
-
-                TextView itemText = (TextView) view.findViewById(R.id.itemTitle);
-                itemText.setText(navItem.getTitle());
-
-                if(navItem.getIcon()!=0) {
-                    ImageView itemImage = (ImageView) view.findViewById(R.id.itemIcon);
-                    itemImage.setImageResource(navItem.getIcon());
-                }
-
-                return view;
-            }
-            // TODO re-enable when "Accounts" is available in Navigation Drawer
-            // Account
-//            if (mAll.get(position) instanceof Account[]){
-//                final View view = inflator.inflate(R.layout.drawer_account_group, null);
-//
-//                final RadioGroup group = (RadioGroup) view.findViewById(R.id.drawer_radio_group);
-//
-//                for (Account account : mAccounts) {
-//                    RadioButton rb = new RadioButton(mContext);
-//
-//                    rb.setText(account.name);
-//                    rb.setContentDescription(account.name);
-//                    rb.setTextColor(Color.BLACK);
-//                    rb.setEllipsize(TextUtils.TruncateAt.MIDDLE);
-//                    rb.setSingleLine();
-//                    rb.setCompoundDrawablePadding(30);
-//
-//
-//                    try {
-//                        // using adapted algorithm from /core/js/placeholder.js:50
-//                        int lastAtPos = account.name.lastIndexOf("@");
-//                        String username  = account.name.substring(0, lastAtPos);
-//                        byte[] seed = username.getBytes("UTF-8");
-//                        MessageDigest md = MessageDigest.getInstance("MD5");
-////                        Integer seedMd5Int = Math.abs(new String(Hex.encodeHex(seedMd5))
-////                      .hashCode());
-//                        Integer seedMd5Int = String.format(Locale.ROOT, "%032x",
-//                                new BigInteger(1, md.digest(seed))).hashCode();
-//
-//                        double maxRange = java.lang.Integer.MAX_VALUE;
-//                        float hue = (float) (seedMd5Int / maxRange * 360);
-//
-//                        int[] rgb = BitmapUtils.HSLtoRGB(hue, 90.0f, 65.0f, 1.0f);
-//
-//                        TextDrawable text = new TextDrawable(username.substring(0, 1).toUpperCase(),
-//                                rgb[0], rgb[1], rgb[2]);
-//                        rb.setCompoundDrawablesWithIntrinsicBounds(text, null, null, null);
-//
-//
-//                    } catch (Exception e){
-//                        Log_OC.d(TAG, e.toString());
-//                        rb.setTextColor(mContext.getResources().getColor(R.color.black));
-//                    }
-//                    RadioGroup.LayoutParams params = new RadioGroup.LayoutParams(
-//                            LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-//                    params.weight=1.0f;
-//                    params.setMargins(15, 5, 5, 5);
-//
-//                    // Check the current account that is being used
-//                    if (account.name.equals(mCurrentAccount.name)) {
-//                        rb.setChecked(true);
-//                    } else {
-//                        rb.setChecked(false);
-//                    }
-//
-//                    group.addView(rb, params);
-//                }
-//
-//                group.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener(){
-//                    public void onCheckedChanged(RadioGroup group, int checkedId) {
-//                        // checkedId is the RadioButton selected
-//                        RadioButton rb = (RadioButton) view.findViewById(checkedId);
-//
-//                        AccountUtils.setCurrentOwnCloudAccount(mContext,rb.getText().toString());
-//                        notifyDataSetChanged();
-//                        mFileActivity.closeDrawer();
-//
-//                        // restart the main activity
-//                        mFileActivity.restart();
-//                    }
-//                });
-//
-//                return view;
-//            }
-        }
-        return convertView;
-    }
-
-    //TODO re-enable when "Accounts" is available in Navigation Drawer
-    // TODO update Account List after creating a new account and on fresh installation
-//    public void setShowAccounts(boolean value){
-//        mAll.clear();
-//        mAll.addAll(mNavigationDrawerItems);
-//
-//        if (value){
-//            mAll.add(1, mAccounts);
-//        }
-//        mShowAccounts = value;
-//    }
-}
diff --git a/src/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.java b/src/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.java
index 1e087ae36be..f92afb5c51a 100644
--- a/src/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.java
@@ -35,7 +35,7 @@
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
-import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncDrawable;
+import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncThumbnailDrawable;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimetypeIconUtil;
 
@@ -120,14 +120,14 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 fileIcon.setImageBitmap(thumbnail);
             } else {
                 // generate new Thumbnail
-                if (ThumbnailsCacheManager.cancelPotentialWork(file, fileIcon)) {
+                if (ThumbnailsCacheManager.cancelPotentialThumbnailWork(file, fileIcon)) {
                     final ThumbnailsCacheManager.ThumbnailGenerationTask task = 
                             new ThumbnailsCacheManager.ThumbnailGenerationTask(fileIcon, mStorageManager, 
                                     mAccount);
                     if (thumbnail == null) {
                         thumbnail = ThumbnailsCacheManager.mDefaultImg;
                     }
-                    final AsyncDrawable asyncDrawable = new AsyncDrawable(
+                    final AsyncThumbnailDrawable asyncDrawable = new AsyncThumbnailDrawable(
                             mContext.getResources(), 
                             thumbnail, 
                             task
diff --git a/src/com/owncloud/android/ui/dialog/AccountActionsDialogFragment.java b/src/com/owncloud/android/ui/dialog/AccountActionsDialogFragment.java
deleted file mode 100644
index e8289d01cfc..00000000000
--- a/src/com/owncloud/android/ui/dialog/AccountActionsDialogFragment.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.owncloud.android.ui.dialog;
-
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import com.owncloud.android.R;
-import com.owncloud.android.ui.dialog.parcel.MenuItemParcelable;
-import com.owncloud.android.ui.dialog.parcel.MenuParcelable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Dialog for choosing a file action.
- */
-public class AccountActionsDialogFragment extends DialogFragment implements
-        OnItemClickListener {
-    private static final String ARG_ITEM_LIST = "ITEM_LIST";
-    private static final String ARG_FILE_POSITION = "FILE_POSITION";
-    public static final String FTAG_FILE_ACTIONS = "FILE_ACTIONS_FRAGMENT";
-
-    private List<MenuItemParcelable> mMenuItems;
-
-    private int mFilePosition;
-
-    private ListView mListView;
-
-    /**
-     * Listener interface for the file action fragment.
-     */
-    public interface FileActionsDialogFragmentListener {
-        // TODO Tobi change to int array?
-        public boolean onFileActionChosen(int menuId, int filePosition);
-    }
-
-    /**
-     * Public factory method to create new FileActionsDialogFragment instances.
-     *
-     * @param menu menu to be display.
-     * @return Dialog ready to show.
-     */
-    public static AccountActionsDialogFragment newInstance(Menu menu, int filePosition) {
-        AccountActionsDialogFragment fragment = new AccountActionsDialogFragment();
-        Bundle args = new Bundle();
-
-        MenuParcelable menuParcelable = new MenuParcelable();
-        menuParcelable.setMenuItems(calculateMenuParcel(menu));
-
-        args.putParcelable(ARG_ITEM_LIST, menuParcelable);
-        args.putInt(ARG_FILE_POSITION, filePosition);
-
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setStyle(DialogFragment.STYLE_NORMAL, R.style.ownCloud_Dialog);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.file_actions, null, false);
-        mListView = (ListView) view.findViewById(R.id.file_actions_list);
-
-        getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        return view;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        mFilePosition = getArguments().getInt(ARG_FILE_POSITION);
-
-        MenuParcelable menu = getArguments().getParcelable(ARG_ITEM_LIST);
-        mMenuItems = menu.getMenuItems();
-        List<String> stringList = new ArrayList<String>();
-        for (int i = 0; i < mMenuItems.size(); i++) {
-            stringList.add(mMenuItems.get(i).getMenuText());
-        }
-
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(),
-                R.layout.simple_dialog_list_item, stringList);
-
-        mListView.setAdapter(adapter);
-
-        mListView.setOnItemClickListener(this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        dismiss();
-        ((FileActionsDialogFragmentListener) getTargetFragment()).onFileActionChosen(mMenuItems.get(position).getMenuItemId(), mFilePosition);
-    }
-
-    /**
-     * calculates a parcelable list of MenuItemParcelable based on the given menu and the visibility of the menu items.
-     *
-     * @param menu the menu to be displayed
-     * @return a filtered List of parcelables based on the menu
-     */
-    private static List<MenuItemParcelable> calculateMenuParcel(Menu menu) {
-        int index = 0;
-        boolean hasNext = true;
-        List<MenuItemParcelable> itemList = new ArrayList<MenuItemParcelable>();
-        MenuParcelable menuParcelable = new MenuParcelable();
-        try {
-            while (hasNext) {
-                MenuItem item = menu.getItem(index);
-                if (item.isVisible()) {
-                    itemList.add(new MenuItemParcelable(item));
-                }
-                index++;
-            }
-        } catch (IndexOutOfBoundsException iobe) {
-            // reach the end of the item list
-        }
-
-        return itemList;
-    }
-}
diff --git a/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java b/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
index cae92dbf65f..6905ef8406f 100644
--- a/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
@@ -97,7 +97,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             messageArguments = new String[]{};
         }
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Theme_ownCloud_Dialog)
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
             .setIcon(R.drawable.ic_warning)
             .setIconAttribute(android.R.attr.alertDialogIcon)
             .setMessage(String.format(getString(messageId), messageArguments));
diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
index 3afc3515fe6..3e0680959b4 100644
--- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -60,7 +60,7 @@ public static ConflictsResolveDialog newInstance(String path, OnConflictDecision
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         String remotepath = getArguments().getString("remotepath");
-        return new AlertDialog.Builder(getActivity(), R.style.Theme_ownCloud_Dialog)
+        return new AlertDialog.Builder(getActivity())
                    .setIcon(R.drawable.ic_warning)
                    .setTitle(R.string.conflict_title)
                    .setMessage(String.format(getString(R.string.conflict_message), remotepath))
diff --git a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
deleted file mode 100644
index f178886c70c..00000000000
--- a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- *   ownCloud Android client application
- *
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.ui.dialog;
-
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnKeyListener;
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.view.KeyEvent;
-import android.widget.ProgressBar;
-
-import com.owncloud.android.R;
-
-
-public class IndeterminateProgressDialog extends DialogFragment {
-
-    private static final String ARG_MESSAGE_ID = IndeterminateProgressDialog.class.getCanonicalName() + ".ARG_MESSAGE_ID";
-    private static final String ARG_CANCELABLE = IndeterminateProgressDialog.class.getCanonicalName() + ".ARG_CANCELABLE";
-
-
-    /**
-     * Public factory method to get dialog instances.
-     * 
-     * @param messageId     Resource id for a message to show in the dialog.
-     * @param cancelable    If 'true', the dialog can be cancelled by the user input (BACK button, touch outside...)
-     * @return              New dialog instance, ready to show.
-     */
-    public static IndeterminateProgressDialog newInstance(int messageId, boolean cancelable) {
-        IndeterminateProgressDialog fragment = new IndeterminateProgressDialog();
-        fragment.setStyle(DialogFragment.STYLE_NO_FRAME, R.style.ownCloud_AlertDialog);
-        Bundle args = new Bundle();
-        args.putInt(ARG_MESSAGE_ID, messageId);
-        args.putBoolean(ARG_CANCELABLE, cancelable);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        /// create indeterminate progress dialog
-        final ProgressDialog progressDialog = new ProgressDialog(getActivity(), R.style.ProgressDialogTheme);
-        progressDialog.setIndeterminate(true);
-        progressDialog.setOnShowListener(new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface dialog) {
-                ProgressBar v = (ProgressBar) progressDialog.findViewById(android.R.id.progress);
-                v.getIndeterminateDrawable().setColorFilter(getResources().getColor(R.color.color_accent),
-                        android.graphics.PorterDuff.Mode.MULTIPLY);
-
-            }
-        });
-        
-        /// set message
-        int messageId = getArguments().getInt(ARG_MESSAGE_ID, R.string.placeholder_sentence);
-        progressDialog.setMessage(getString(messageId));
-
-        /// set cancellation behavior
-        boolean cancelable = getArguments().getBoolean(ARG_CANCELABLE, false);
-        if (!cancelable) {
-            progressDialog.setCancelable(false);
-            // disable the back button
-            OnKeyListener keyListener = new OnKeyListener() {
-                @Override
-                public boolean onKey(DialogInterface dialog, int keyCode,
-                        KeyEvent event) {
-
-                    if( keyCode == KeyEvent.KEYCODE_BACK) {
-                        return true;
-                    }
-                    return false;
-                }
-
-            };
-            progressDialog.setOnKeyListener(keyListener);
-        }
-        
-        return progressDialog;
-    }    
-    
-}
-
-
diff --git a/src/com/owncloud/android/ui/dialog/LoadingDialog.java b/src/com/owncloud/android/ui/dialog/LoadingDialog.java
index 1578500e2d6..f6cedbe7f0c 100644
--- a/src/com/owncloud/android/ui/dialog/LoadingDialog.java
+++ b/src/com/owncloud/android/ui/dialog/LoadingDialog.java
@@ -21,9 +21,12 @@
 import com.owncloud.android.R;
 
 import android.app.Dialog;
+import android.content.DialogInterface;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
+import android.support.v4.content.ContextCompat;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -33,12 +36,9 @@
 
 public class LoadingDialog extends DialogFragment {
 
-    private String mMessage;
-    
-    public LoadingDialog() {
-        super();
-    }
-    
+    private static final String ARG_MESSAGE_ID = LoadingDialog.class.getCanonicalName() + ".ARG_MESSAGE_ID";
+    private static final String ARG_CANCELABLE = LoadingDialog.class.getCanonicalName() + ".ARG_CANCELABLE";
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -46,8 +46,20 @@ public void onCreate(Bundle savedInstanceState) {
         setCancelable(false);
     }
 
-    public LoadingDialog(String message) {
-        this.mMessage = message;
+    /**
+     * Public factory method to get dialog instances.
+     *
+     * @param messageId     Resource id for a message to show in the dialog.
+     * @param cancelable    If 'true', the dialog can be cancelled by the user input (BACK button, touch outside...)
+     * @return              New dialog instance, ready to show.
+     */
+    public static LoadingDialog newInstance(int messageId, boolean cancelable) {
+        LoadingDialog fragment = new LoadingDialog();
+        Bundle args = new Bundle();
+        args.putInt(ARG_MESSAGE_ID, messageId);
+        args.putBoolean(ARG_CANCELABLE, cancelable);
+        fragment.setArguments(args);
+        return fragment;
     }
 
     @Override
@@ -55,14 +67,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         // Create a view by inflating desired layout
         View v = inflater.inflate(R.layout.loading_dialog, container,  false);
         
-        // set value
+        // set message
         TextView tv  = (TextView) v.findViewById(R.id.loadingText);
-        tv.setText(mMessage);
+        int messageId = getArguments().getInt(ARG_MESSAGE_ID, R.string.placeholder_sentence);
+        tv.setText(messageId);
 
         // set progress wheel color
         ProgressBar progressBar  = (ProgressBar) v.findViewById(R.id.loadingBar);
         progressBar.getIndeterminateDrawable().setColorFilter(
-                getResources().getColor(R.color.color_accent), PorterDuff.Mode.SRC_IN);
+            ContextCompat.getColor(getActivity(), R.color.color_accent),
+            PorterDuff.Mode.SRC_IN
+        );
         
         return v;
     }
@@ -71,6 +86,25 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         Dialog dialog = super.onCreateDialog(savedInstanceState);
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        /// set cancellation behavior
+        boolean cancelable = getArguments().getBoolean(ARG_CANCELABLE, false);
+        dialog.setCancelable(cancelable);
+        if (!cancelable) {
+            // disable the back button
+            DialogInterface.OnKeyListener keyListener = new DialogInterface.OnKeyListener() {
+                @Override
+                public boolean onKey(DialogInterface dialog, int keyCode,
+                                     KeyEvent event) {
+
+                    if( keyCode == KeyEvent.KEYCODE_BACK) {
+                        return true;
+                    }
+                    return false;
+                }
+            };
+            dialog.setOnKeyListener(keyListener);
+        }
         return dialog;
     }
 
diff --git a/src/com/owncloud/android/ui/dialog/OwnCloudListPreference.java b/src/com/owncloud/android/ui/dialog/OwnCloudListPreference.java
index 54ec4995c6f..8718ae92cef 100644
--- a/src/com/owncloud/android/ui/dialog/OwnCloudListPreference.java
+++ b/src/com/owncloud/android/ui/dialog/OwnCloudListPreference.java
@@ -52,7 +52,7 @@ protected void showDialog(Bundle state) {
 
         // same thing happens for the Standard ListPreference though
         android.support.v7.app.AlertDialog.Builder builder =
-                new android.support.v7.app.AlertDialog.Builder(mContext, R.style.ownCloud_AlertDialog)
+                new android.support.v7.app.AlertDialog.Builder(mContext)
                 .setTitle(getDialogTitle())
                 .setIcon(getDialogIcon())
                 .setSingleChoiceItems(getEntries(), preselect, this);
diff --git a/src/com/owncloud/android/ui/dialog/RemoveAccountDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveAccountDialogFragment.java
new file mode 100644
index 00000000000..e831a476b8d
--- /dev/null
+++ b/src/com/owncloud/android/ui/dialog/RemoveAccountDialogFragment.java
@@ -0,0 +1,117 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.ui.dialog;
+
+/**
+ *  Dialog requiring confirmation before removing an OC Account.
+ * 
+ *  Removes the account if the user confirms.
+ *
+ *  Container Activity needs to implement AccountManagerCallback<Boolean>.
+ */
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.app.Activity;
+import android.app.Dialog;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+
+import com.owncloud.android.R;
+import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
+
+public class RemoveAccountDialogFragment extends ConfirmationDialogFragment
+    implements ConfirmationDialogFragmentListener {
+
+    private Account mTargetAccount;
+
+    private static final String ARG_TARGET_ACCOUNT = "TARGET_ACCOUNT";
+
+    /**
+     * Public factory method to create new RemoveAccountDialogFragment instances.
+     * 
+     * @param account         Account to remove.
+     * @return                Dialog ready to show.
+     */
+    public static RemoveAccountDialogFragment newInstance(Account account) {
+        if (account == null ) {
+            throw new IllegalArgumentException("Cannot remove a NULL account");
+        }
+
+        RemoveAccountDialogFragment frag = new RemoveAccountDialogFragment();
+        Bundle args = new Bundle();
+        args.putInt(ARG_MESSAGE_RESOURCE_ID, R.string.confirmation_remove_account_alert);
+        args.putStringArray(ARG_MESSAGE_ARGUMENTS, new String[]{account.name});
+        args.putInt(ARG_POSITIVE_BTN_RES, R.string.common_yes);
+        args.putInt(ARG_NEUTRAL_BTN_RES, R.string.common_no);
+        args.putInt(ARG_NEGATIVE_BTN_RES, -1);
+        args.putParcelable(ARG_TARGET_ACCOUNT, account);
+        frag.setArguments(args);
+        
+        return frag;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        // checked here to fail soon in case of wrong usage
+        try {
+            AccountManagerCallback<Boolean> a = (AccountManagerCallback<Boolean>)getActivity();
+        } catch (ClassCastException c) {
+            throw new IllegalStateException(
+                "Container Activity needs to implement (AccountManagerCallback<Boolean>)", c
+            );
+        }
+    }
+
+    @Override @NonNull
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Dialog dialog = super.onCreateDialog(savedInstanceState);
+        mTargetAccount = getArguments().getParcelable(ARG_TARGET_ACCOUNT);
+        
+        setOnConfirmationListener(this);
+        
+        return dialog;
+    }    
+
+    /**
+     * Performs the removal of the target account.
+     */
+    @Override
+    public void onConfirmation(String callerTag) {
+        Activity parentActivity = getActivity();
+        AccountManager am = AccountManager.get(parentActivity);
+        AccountManagerCallback<Boolean> callback = (AccountManagerCallback<Boolean>)parentActivity;
+        am.removeAccount(mTargetAccount, callback, new Handler());
+    }
+    
+    @Override
+    public void onCancel(String callerTag) {
+        // nothing to do here
+    }
+
+    @Override
+    public void onNeutral(String callerTag) {
+        // nothing to do here
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
index 0fd9a4736e8..726b7f4e79b 100644
--- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
+++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
@@ -125,7 +125,7 @@ public void onCreate(Bundle savedInstanceState) {
             mTargetUrl = savedInstanceState.getString(ARG_TARGET_URL);
         }
         
-        setStyle(DialogFragment.STYLE_NO_TITLE, R.style.Theme_ownCloud_Dialog);
+        setStyle(DialogFragment.STYLE_NO_TITLE, 0);
     }
     
     @SuppressWarnings("deprecation")
diff --git a/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java b/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
index 93f6e59d3d0..12e6c37cf4c 100644
--- a/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
@@ -84,8 +84,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         inputText.requestFocus();
 
         // Build the dialog
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),
-                R.style.Theme_ownCloud_Dialog_NoButtonBarStyle);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setView(v)
                .setPositiveButton(R.string.common_ok, this)
                .setNegativeButton(R.string.common_cancel, this)
diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index ffd20c2c1cd..17783ff46f4 100644
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -443,7 +443,7 @@ private void setFiletype(OCFile file) {
                     iv.setImageBitmap(thumbnail);
                 } else {
                     // generate new Thumbnail
-                    if (ThumbnailsCacheManager.cancelPotentialWork(file, iv)) {
+                    if (ThumbnailsCacheManager.cancelPotentialThumbnailWork(file, iv)) {
                         final ThumbnailsCacheManager.ThumbnailGenerationTask task =
                                 new ThumbnailsCacheManager.ThumbnailGenerationTask(
                                         iv, mContainerActivity.getStorageManager(), mAccount
@@ -451,8 +451,8 @@ private void setFiletype(OCFile file) {
                         if (thumbnail == null) {
                             thumbnail = ThumbnailsCacheManager.mDefaultImg;
                         }
-                        final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
-                                new ThumbnailsCacheManager.AsyncDrawable(
+                        final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
+                                new ThumbnailsCacheManager.AsyncThumbnailDrawable(
                                         MainApp.getAppContext().getResources(),
                                         thumbnail,
                                         task
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 6cf666dc423..662f8aa6d0f 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -28,7 +28,9 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v4.widget.DrawerLayout;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -60,6 +62,7 @@
 import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
+import com.owncloud.android.ui.helpers.SparseBooleanArrayParcelable;
 import com.owncloud.android.ui.preview.PreviewAudioFragment;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewTextFragment;
@@ -103,6 +106,7 @@ public class OCFileListFragment extends ExtendedListFragment {
     private boolean mHideFab = true;
     private boolean miniFabClicked = false;
     private ActionMode mActiveActionMode;
+    private OCFileListFragment.MultiChoiceModeListener mMultiChoiceModeListener;
 
 
     /**
@@ -168,7 +172,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         Bundle args = getArguments();
         boolean allowContextualActions = (args != null) && args.getBoolean(ARG_ALLOW_CONTEXTUAL_MODE, false);
         if (allowContextualActions) {
-            setChoiceModeAsMultipleModal();
+            setChoiceModeAsMultipleModal(savedInstanceState);
         }
         Log_OC.i(TAG, "onCreateView() end");
         return v;
@@ -359,79 +363,195 @@ private void removeFabLabels() {
                 com.getbase.floatingactionbutton.R.id.fab_label)).setVisibility(View.GONE);
     }
 
-    private void setChoiceModeAsMultipleModal() {
+    /**
+     * Handler for multiple selection mode.
+     *
+     * Manages input from the user when one or more files or folders are selected in the list.
+     *
+     * Also listens to changes in navigation drawer to hide and recover multiple selection when it's opened
+     * and closed.
+     */
+    private class MultiChoiceModeListener
+        implements AbsListView.MultiChoiceModeListener, DrawerLayout.DrawerListener {
 
-        setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
+        private static final String KEY_ACTION_MODE_CLOSED_BY_DRAWER = "KILLED_ACTION_MODE";
+        private static final String KEY_SELECTION_WHEN_CLOSED_BY_DRAWER = "CHECKED_ITEMS";
 
-        setMultiChoiceModeListener(new AbsListView.MultiChoiceModeListener() {
+        /**
+         * True when action mode is finished because the drawer was opened
+         */
+        private boolean mActionModeClosedByDrawer = false;
 
-            @Override
-            public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
-                getListView().invalidateViews();
-                mode.invalidate();
-            }
+        /**
+         * Selected items in list when action mode is closed by drawer
+         */
+        private SparseBooleanArray mSelectionWhenActionModeClosedByDrawer = null;
 
-            @Override
-            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                mActiveActionMode = mode;
-
-                MenuInflater inflater = getActivity().getMenuInflater();
-                inflater.inflate(R.menu.file_actions_menu, menu);
-                mode.invalidate();
-
-                //set gray color
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    Window w = getActivity().getWindow();
-                    mStatusBarColor = w.getStatusBarColor();
-                    w.setStatusBarColor(mStatusBarColorActionMode);
+        @Override
+        public void onDrawerSlide(View drawerView, float slideOffset) {
+            // nothing to do
+        }
+
+        @Override
+        public void onDrawerOpened(View drawerView) {
+            // nothing to do
+        }
+
+        /**
+         * When the navigation drawer is closed, action mode is recovered in the same state as was
+         * when the drawer was (started to be) opened.
+         *
+         * @param drawerView        Navigation drawer just closed.
+         */
+        @Override
+        public void onDrawerClosed(View drawerView) {
+            if (mSelectionWhenActionModeClosedByDrawer !=null && mActionModeClosedByDrawer) {
+                for (int i = 0; i< mSelectionWhenActionModeClosedByDrawer.size(); i++) {
+                    if (mSelectionWhenActionModeClosedByDrawer.valueAt(i)) {
+                        getListView().setItemChecked(
+                            mSelectionWhenActionModeClosedByDrawer.keyAt(i),
+                            true
+                        );
+                    }
                 }
+            }
+            mSelectionWhenActionModeClosedByDrawer = null;
+        }
 
-                // hide FAB in multi selection mode
-                setFabEnabled(false);
+        /**
+         * If the action mode is active when the navigation drawer starts to move, the action
+         * mode is closed and the selection stored to be recovered when the drawer is closed.
+         *
+         * @param newState     One of STATE_IDLE, STATE_DRAGGING or STATE_SETTLING.
+         */
+        @Override
+        public void onDrawerStateChanged(int newState) {
+            if (DrawerLayout.STATE_DRAGGING == newState && mActiveActionMode != null) {
+                mSelectionWhenActionModeClosedByDrawer = getListView().getCheckedItemPositions().clone();
+                mActiveActionMode.finish();
+                mActionModeClosedByDrawer = true;
+            }
+        }
 
-                return true;
+
+        /**
+         * Update action mode bar when an item is selected / unselected in the list
+         */
+        @Override
+        public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
+            getListView().invalidateViews();
+            mode.invalidate();
+        }
+
+        /**
+         * Load menu and customize UI when action mode is started.
+         */
+        @Override
+        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            mActiveActionMode = mode;
+
+            MenuInflater inflater = getActivity().getMenuInflater();
+            inflater.inflate(R.menu.file_actions_menu, menu);
+            mode.invalidate();
+
+            //set gray color
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                Window w = getActivity().getWindow();
+                mStatusBarColor = w.getStatusBarColor();
+                w.setStatusBarColor(mStatusBarColorActionMode);
             }
 
-            @Override
-            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                List<OCFile> checkedFiles = mAdapter.getCheckedItems(getListView());
-                final int checkedCount = checkedFiles.size();
-                String title = getResources().getQuantityString(
-                    R.plurals.items_selected_count,
-                    checkedCount,
-                    checkedCount
-                );
-                mode.setTitle(title);
-                FileMenuFilter mf = new FileMenuFilter(
-                    checkedFiles,
-                    ((FileActivity) getActivity()).getAccount(),
-                    mContainerActivity,
-                    getActivity()
-                );
-                mf.filter(menu);
-                return true;
+            // hide FAB in multi selection mode
+            setFabEnabled(false);
+
+            return true;
+        }
+
+        /**
+         * Updates available action in menu depending on current selection.
+         */
+        @Override
+        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+            List<OCFile> checkedFiles = mAdapter.getCheckedItems(getListView());
+            final int checkedCount = checkedFiles.size();
+            String title = getResources().getQuantityString(
+                R.plurals.items_selected_count,
+                checkedCount,
+                checkedCount
+            );
+            mode.setTitle(title);
+            FileMenuFilter mf = new FileMenuFilter(
+                checkedFiles,
+                ((FileActivity) getActivity()).getAccount(),
+                mContainerActivity,
+                getActivity()
+            );
+            mf.filter(menu);
+            return true;
+        }
+
+        /**
+         * Starts the corresponding action when a menu item is tapped by the user.
+         */
+        @Override
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+            return onFileActionChosen(item.getItemId());
+        }
+
+        /**
+         * Restores UI.
+         */
+        @Override
+        public void onDestroyActionMode(ActionMode mode) {
+            mActiveActionMode = null;
+
+            // reset to previous color
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                getActivity().getWindow().setStatusBarColor(mStatusBarColor);
             }
 
-            @Override
-            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                return onFileActionChosen(item.getItemId());
+            // show FAB on multi selection mode exit
+            if(!mHideFab) {
+                setFabEnabled(true);
             }
+        }
 
-            @Override
-            public void onDestroyActionMode(ActionMode mode) {
-                mActiveActionMode = null;
 
-                // reset to previous color
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    getActivity().getWindow().setStatusBarColor(mStatusBarColor);
-                }
+        public void storeStateIn(Bundle outState) {
+            outState.putBoolean(KEY_ACTION_MODE_CLOSED_BY_DRAWER, mActionModeClosedByDrawer);
+            if (mSelectionWhenActionModeClosedByDrawer != null) {
+                SparseBooleanArrayParcelable sbap = new SparseBooleanArrayParcelable(
+                    mSelectionWhenActionModeClosedByDrawer
+                );
+                outState.putParcelable(KEY_SELECTION_WHEN_CLOSED_BY_DRAWER, sbap);
+            }
+        }
 
-                // show FAB on multi selection mode exit
-                if(!mHideFab) {
-                    setFabEnabled(true);
-                }
+        public void loadStateFrom(Bundle savedInstanceState) {
+            mActionModeClosedByDrawer = savedInstanceState.getBoolean(
+                KEY_ACTION_MODE_CLOSED_BY_DRAWER,
+                mActionModeClosedByDrawer
+            );
+            SparseBooleanArrayParcelable sbap = savedInstanceState.getParcelable(
+                KEY_SELECTION_WHEN_CLOSED_BY_DRAWER
+            );
+            if (sbap != null) {
+                mSelectionWhenActionModeClosedByDrawer = sbap.getSparseBooleanArray();
             }
-        });
+        }
+    }
+
+    /**
+     * Init listener that will handle interactions in multiple selection mode.
+     */
+    private void setChoiceModeAsMultipleModal(Bundle savedInstanceState) {
+        setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
+        mMultiChoiceModeListener = new MultiChoiceModeListener();
+        if (savedInstanceState != null) {
+            mMultiChoiceModeListener.loadStateFrom(savedInstanceState);
+        }
+        setMultiChoiceModeListener(mMultiChoiceModeListener);
+        ((FileActivity)getActivity()).addDrawerListener(mMultiChoiceModeListener);
     }
 
     /**
@@ -441,6 +561,7 @@ public void onDestroyActionMode(ActionMode mode) {
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putParcelable(KEY_FILE, mFile);
+        mMultiChoiceModeListener.storeStateIn(outState);
     }
 
     @Override
diff --git a/src/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/src/com/owncloud/android/ui/helpers/FileOperationsHelper.java
index dfd477573d1..1ef3404872f 100644
--- a/src/com/owncloud/android/ui/helpers/FileOperationsHelper.java
+++ b/src/com/owncloud/android/ui/helpers/FileOperationsHelper.java
@@ -153,10 +153,7 @@ private void showNoAppForFileTypeToast(Context context) {
     public void shareFileViaLink(OCFile file, String password) {
         if (isSharedSupported()) {
             if (file != null) {
-                mFileActivity.showLoadingDialog(
-                        mFileActivity.getApplicationContext().
-                                getString(R.string.wait_a_moment)
-                );
+                mFileActivity.showLoadingDialog(R.string.wait_a_moment);
                 Intent service = new Intent(mFileActivity, OperationsService.class);
                 service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
                 service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
@@ -184,8 +181,7 @@ public void shareFileViaLink(OCFile file, String password) {
     public void getFileWithLink(OCFile file){
         if (isSharedSupported()) {
             if (file != null) {
-                mFileActivity.showLoadingDialog(mFileActivity.getApplicationContext().
-                        getString(R.string.wait_a_moment));
+                mFileActivity.showLoadingDialog(R.string.wait_a_moment);
 
                 Intent service = new Intent(mFileActivity, OperationsService.class);
                 service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
@@ -217,8 +213,7 @@ public void getFileWithLink(OCFile file){
     public void shareFileWithSharee(OCFile file, String shareeName, ShareType shareType, int permissions) {
         if (file != null) {
             // TODO check capability?
-            mFileActivity.showLoadingDialog(mFileActivity.getApplicationContext().
-                getString(R.string.wait_a_moment));
+            mFileActivity.showLoadingDialog(R.string.wait_a_moment);
 
             Intent service = new Intent(mFileActivity, OperationsService.class);
             service.setAction(OperationsService.ACTION_CREATE_SHARE_WITH_SHAREE);
@@ -286,8 +281,7 @@ private void queueShareIntent(Intent shareIntent){
             mWaitingForOpId = mFileActivity.getOperationsServiceBinder().
                     queueNewOperation(shareIntent);
 
-            mFileActivity.showLoadingDialog(mFileActivity.getApplicationContext().
-                    getString(R.string.wait_a_moment));
+            mFileActivity.showLoadingDialog(R.string.wait_a_moment);
 
         } else {
             // Show a Message
@@ -492,7 +486,7 @@ public void renameFile(OCFile file, String newFilename) {
         service.putExtra(OperationsService.EXTRA_NEWNAME, newFilename);
         mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
         
-        mFileActivity.showLoadingDialog(mFileActivity.getString(R.string.wait_a_moment));
+        mFileActivity.showLoadingDialog(R.string.wait_a_moment);
     }
 
 
@@ -514,7 +508,7 @@ public void removeFiles(Collection<OCFile> files, boolean onlyLocalCopy) {
             mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
         }
         
-        mFileActivity.showLoadingDialog(mFileActivity.getString(R.string.wait_a_moment));
+        mFileActivity.showLoadingDialog(R.string.wait_a_moment);
     }
 
 
@@ -527,7 +521,7 @@ public void createFolder(String remotePath, boolean createFullPath) {
         service.putExtra(OperationsService.EXTRA_CREATE_FULL_PATH, createFullPath);
         mWaitingForOpId =  mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
         
-        mFileActivity.showLoadingDialog(mFileActivity.getString(R.string.wait_a_moment));
+        mFileActivity.showLoadingDialog(R.string.wait_a_moment);
     }
 
     /**
@@ -570,7 +564,7 @@ public void moveFiles(Collection<OCFile> files, OCFile targetFolder) {
             service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
             mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
         }
-        mFileActivity.showLoadingDialog(mFileActivity.getString(R.string.wait_a_moment));
+        mFileActivity.showLoadingDialog(R.string.wait_a_moment);
     }
 
     /**
@@ -588,7 +582,7 @@ public void copyFiles(Collection<OCFile> files, OCFile targetFolder) {
             service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
             mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
         }
-        mFileActivity.showLoadingDialog(mFileActivity.getString(R.string.wait_a_moment));
+        mFileActivity.showLoadingDialog(R.string.wait_a_moment);
     }
 
     public long getOpIdWaitingFor() {
@@ -623,8 +617,6 @@ public void checkCurrentCredentials(Account account) {
         service.putExtra(OperationsService.EXTRA_ACCOUNT, account);
         mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
 
-        mFileActivity.showLoadingDialog(
-            mFileActivity.getString(R.string.wait_checking_credentials)
-        );
+        mFileActivity.showLoadingDialog(R.string.wait_checking_credentials);
     }
 }
diff --git a/src/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java b/src/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java
new file mode 100644
index 00000000000..c4d4fa7a763
--- /dev/null
+++ b/src/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java
@@ -0,0 +1,91 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.ui.helpers;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.SparseBooleanArray;
+
+/**
+ * Wraps a SparseBooleanArrayParcelable to allow its serialization and desearialization
+ * through {@link Parcelable} interface.
+ */
+public class SparseBooleanArrayParcelable implements Parcelable {
+
+    public static Parcelable.Creator<SparseBooleanArrayParcelable> CREATOR =
+        new Parcelable.Creator<SparseBooleanArrayParcelable>() {
+
+        @Override
+        public SparseBooleanArrayParcelable createFromParcel(Parcel source) {
+            // read size of array from source
+            int size = source.readInt();
+
+            // then pairs of (key, value)s, in the object to wrap
+            SparseBooleanArray sba = new SparseBooleanArray();
+            int key;
+            boolean value;
+            for (int i = 0; i < size; i++) {
+                key = source.readInt();
+                value = (source.readInt() != 0);
+                sba.put(key, value);
+            }
+
+            // wrap SparseBooleanArray
+            return new SparseBooleanArrayParcelable(sba);
+        }
+
+        @Override
+        public SparseBooleanArrayParcelable[] newArray(int size) {
+            return new SparseBooleanArrayParcelable[size];
+        }
+    };
+
+    private final SparseBooleanArray mSba;
+
+    public SparseBooleanArrayParcelable(SparseBooleanArray sba) {
+        if (sba == null) {
+            throw new IllegalArgumentException("Cannot wrap a null SparseBooleanArray");
+        }
+        mSba = sba;
+    }
+
+    public SparseBooleanArray getSparseBooleanArray() {
+        return mSba;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        // first, size of the array
+        dest.writeInt(mSba.size());
+
+        // then, pairs of (key, value)
+        for (int i = 0; i < mSba.size(); i++) {
+            dest.writeInt(mSba.keyAt(i));
+            dest.writeInt(mSba.valueAt(i) ? 1 : 0);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/ui/helpers/UriUploader.java b/src/com/owncloud/android/ui/helpers/UriUploader.java
index a83096b2cce..de2336c2ac7 100644
--- a/src/com/owncloud/android/ui/helpers/UriUploader.java
+++ b/src/com/owncloud/android/ui/helpers/UriUploader.java
@@ -177,8 +177,7 @@ private void requestUpload(String localPath, String remotePath) {
      */
     private void copyThenUpload(Uri[] sourceUris, String[] remotePaths) {
         if (mShowWaitingDialog) {
-            mActivity.showLoadingDialog(mActivity.getResources().
-                    getString(R.string.wait_for_tmp_copy_from_private_storage));
+            mActivity.showLoadingDialog(R.string.wait_for_tmp_copy_from_private_storage);
         }
 
         CopyAndUploadContentUrisTask copyTask = new CopyAndUploadContentUrisTask
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index bdf409877ae..577bf93a6f7 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -88,9 +88,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.preview_image_activity);
 
-        // Navigation Drawer
-        initDrawer();
-
         // ActionBar
         ActionBar actionBar = getSupportActionBar();
         updateActionBarTitleAndHomeButton(null);
@@ -110,10 +107,10 @@ public void onSystemUiVisibilityChange(int flags) {
                 ActionBar actionBar = getSupportActionBar();
                 if (visible) {
                     actionBar.show();
-                    mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
+                    setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
                 } else {
                     actionBar.hide();
-                    mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                    setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
                 }
             }
         });
@@ -271,8 +268,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
         
         switch(item.getItemId()){
         case android.R.id.home:
-            if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
-                mDrawerLayout.closeDrawer(GravityCompat.START);
+            if (isDrawerOpen()) {
+                closeDrawer();
             } else {
                 backToDisplayActivity();
             }
@@ -338,7 +335,7 @@ public void onPageSelected(int position) {
 
             OCFile currentFile = mPreviewImagePagerAdapter.getFileAt(position);
             getSupportActionBar().setTitle(currentFile.getFileName());
-            mDrawerToggle.setDrawerIndicatorEnabled(false);
+            setDrawerIndicatorEnabled(false);
             if (!mPreviewImagePagerAdapter.pendingErrorAt(position)) {
                 getFileOperationsHelper().syncFile(currentFile);
             }
@@ -488,4 +485,5 @@ public void allFilesOption(){
         backToDisplayActivity();
         super.allFilesOption();
     }
+
 }
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 2d9d3c0f539..c69e68c31be 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -186,6 +186,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         mProgressController = new TransferProgressController(mContainerActivity);
         mProgressController.setProgressBar(mProgressBar);
+        mProgressController.hideProgressBar();
         if (savedInstanceState != null) {
             if (!mIgnoreFirstSavedState) {
                 OCFile file = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE);
diff --git a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
index d8ba791d18c..029220f284e 100644
--- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -251,7 +251,7 @@ public void showLoadingDialog() {
             LoadingDialog loading = null;
             if (frag == null) {
                 // Construct dialog
-                loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment));
+                loading = LoadingDialog.newInstance(R.string.wait_a_moment, false);
                 FragmentManager fm = getActivity().getSupportFragmentManager();
                 FragmentTransaction ft = fm.beginTransaction();
                 loading.show(ft, DIALOG_WAIT_TAG);
diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
index ca7bbac82ec..aec59af5187 100644
--- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
@@ -122,6 +122,7 @@ public void onBackPressed() {
         i.putExtra(EXTRA_AUTOPLAY, mVideoPlayer.isPlaying());
         i.putExtra(EXTRA_START_POSITION, mVideoPlayer.getCurrentPosition());
         setResult(RESULT_OK, i);
+        mVideoPlayer.stopPlayback();
         super.onBackPressed();
     }
 
diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoFragment.java b/src/com/owncloud/android/ui/preview/PreviewVideoFragment.java
index 27394ea02e7..fb526688566 100644
--- a/src/com/owncloud/android/ui/preview/PreviewVideoFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewVideoFragment.java
@@ -501,8 +501,8 @@ private void startFullScreenVideo() {
         i.putExtra(FileActivity.EXTRA_ACCOUNT, mAccount);
         i.putExtra(FileActivity.EXTRA_FILE, getFile());
         i.putExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, mVideoPreview.isPlaying());
-        mVideoPreview.pause();
         i.putExtra(PreviewVideoActivity.EXTRA_START_POSITION, mVideoPreview.getCurrentPosition());
+        mVideoPreview.stopPlayback();
         startActivityForResult(i, FileActivity.REQUEST_CODE__LAST_SHARED + 1);
     }
 
diff --git a/src/com/owncloud/android/utils/BitmapUtils.java b/src/com/owncloud/android/utils/BitmapUtils.java
index f156ff8be4b..9a30c4ff802 100644
--- a/src/com/owncloud/android/utils/BitmapUtils.java
+++ b/src/com/owncloud/android/utils/BitmapUtils.java
@@ -19,17 +19,26 @@
  */
 package com.owncloud.android.utils;
 
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.graphics.BitmapFactory.Options;
 import android.media.ExifInterface;
 import android.net.Uri;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
 import android.webkit.MimeTypeMap;
 
 import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
 
 /**
  * Utility class with methods for decoding Bitmaps.
@@ -70,7 +79,6 @@ public static Bitmap decodeSampledBitmapFromFile(String srcPath, int reqWidth, i
         // decode bitmap with inSampleSize set
         options.inJustDecodeBounds = false;
         return BitmapFactory.decodeFile(srcPath, options);
-        
     }    
 
 
@@ -266,5 +274,42 @@ public static boolean isImage(File file) {
 
         return (mimeType != null && mimeType.startsWith("image/"));
     }
-    
+
+    /**
+     * calculates the RGB value based on a given account name.
+     *
+     * @param accountName The account name
+     * @return corresponding RGB color
+     * @throws UnsupportedEncodingException if the charset is not supported
+     * @throws NoSuchAlgorithmException if the specified algorithm is not available
+     */
+    public static int[] calculateAvatarBackgroundRGB(String accountName)
+        throws UnsupportedEncodingException, NoSuchAlgorithmException {
+        // using adapted algorithm from /core/js/placeholder.js:50
+        String username = AccountUtils.getUsernameOfAccount(accountName);
+        byte[] seed = username.getBytes("UTF-8");
+        MessageDigest md = MessageDigest.getInstance("MD5");
+//      Integer seedMd5Int = Math.abs(new String(Hex.encodeHex(seedMd5)).hashCode());
+        Integer seedMd5Int = String.format(Locale.ROOT, "%032x",
+                new BigInteger(1, md.digest(seed))).hashCode();
+
+        double maxRange = Integer.MAX_VALUE;
+        float hue = (float) (seedMd5Int / maxRange * 360);
+
+        return BitmapUtils.HSLtoRGB(hue, 90.0f, 65.0f, 1.0f);
+    }
+
+    /**
+     * Returns a new circular bitmap drawable by creating it from a bitmap, setting initial target density based on
+     * the display metrics of the resources.
+     *
+     * @param resources the resources for initial target density
+     * @param bitmap the original bitmap
+     * @return the circular bitmap
+     */
+    public static RoundedBitmapDrawable bitmapToCircularBitmapDrawable(Resources resources, Bitmap bitmap) {
+        RoundedBitmapDrawable roundedBitmap = RoundedBitmapDrawableFactory.create(resources, bitmap);
+        roundedBitmap.setCircular(true);
+        return roundedBitmap;
+    }
 }
diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index b19f1b9b4be..ef96c43a42f 100644
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -22,9 +22,12 @@
 
 package com.owncloud.android.utils;
 
+import android.accounts.Account;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.os.Build;
@@ -32,14 +35,16 @@
 import android.support.v4.content.ContextCompat;
 import android.text.format.DateUtils;
 import android.view.Display;
-import android.view.View;
+import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.SeekBar;
-import android.widget.TextView;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.datamodel.ThumbnailsCacheManager;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.ui.DefaultAvatarTextDrawable;
 
 import java.math.BigDecimal;
 import java.net.IDN;
@@ -53,6 +58,7 @@
  * A helper class for some string operations.
  */
 public class DisplayUtils {
+    private static final String TAG = DisplayUtils.class.getSimpleName();
     
     private static final String OWNCLOUD_APP_NAME = "ownCloud";
     
@@ -293,4 +299,40 @@ public static void colorSnackbar(Context context, Snackbar snackbar) {
         // Changing action button text color
         snackbar.setActionTextColor(ContextCompat.getColor(context, R.color.white));
     }
+
+    /**
+     * Show the avatar corresponding to the received account in an {@ImageView}.
+     *
+     * The avatar is shown if available locally in {@link ThumbnailsCacheManager}. The avatar is not
+     * fetched from the server if not available.
+     *
+     * If there is no avatar stored, a colored icon is generated with the first letter of the account username.
+     *
+     * If this is not possible either, a predefined user icon is shown instead.
+     *
+     * @param account           OC account which avatar will be shown.
+     * @param displayView       The image view to set the avatar on.
+     * @param displayRadius     The radius of the circle where the avatar will be clipped into.
+     * @param fetchFromServer   When 'true', if there is no avatar stored in the cache, it's fetched from
+     *                          the server. When 'false', server is not accessed, the fallback avatar is
+     *                          generated instead. USE WITH CARE, probably to be removed in the future.
+     *
+     */
+    public static void showAccountAvatar(
+        Account account,
+        ImageView displayView,
+        float displayRadius,
+        boolean fetchFromServer
+    ) {
+        if (account != null) {
+            // not just accessibility support, used to know what account is bound to each imageView
+            displayView.setContentDescription(account.name);
+
+            final ThumbnailsCacheManager.GetAvatarTask task =
+                new ThumbnailsCacheManager.GetAvatarTask(
+                    displayView, account, displayRadius, fetchFromServer
+                );
+            task.execute();
+        }
+    }
 }