diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
index daa67253..0c8b9c99 100644
--- a/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
@@ -225,8 +225,7 @@ public class FolderPickerActivity extends SyncthingActivity
 
     @Override
     public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-        ArrayAdapter<File> adapter = (ArrayAdapter<File>) mListView.getAdapter();
-        File f = adapter.getItem(i);
+        File f = mFilesAdapter.getItem(i);
         if (f.isDirectory()) {
             displayFolder(f);
             invalidateOptions();
diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java
index 9ad7f940..a7b0c368 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java
@@ -5,7 +5,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -159,14 +158,10 @@ public class DrawerFragment extends Fragment implements RestApi.OnReceiveSystemI
 
         mDeviceId.setText(info.myID);
         mDeviceId.setVisibility(View.VISIBLE);
-        mDeviceId.setOnTouchListener(new View.OnTouchListener() {
+        mDeviceId.setOnClickListener(new View.OnClickListener() {
             @Override
-            public boolean onTouch(View view, MotionEvent motionEvent) {
-                if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
-                    mActivity.getApi().copyDeviceId(mDeviceId.getText().toString());
-                    return true;
-                }
-                return false;
+            public void onClick(View v) {
+                mActivity.getApi().copyDeviceId(mDeviceId.getText().toString());
             }
         });
         mCpuUsage.setText(new DecimalFormat("0.00").format(info.cpuPercent) + "%");
diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java
index ee02be54..afce907e 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java
@@ -180,7 +180,7 @@ public class FolderFragment extends Fragment
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_folder, null);
+        return inflater.inflate(R.layout.fragment_folder, container, false);
     }
 
     @Override
diff --git a/src/main/res/layout/item_menu.xml b/src/main/res/layout/item_menu.xml
deleted file mode 100644
index f7b6bb0d..00000000
--- a/src/main/res/layout/item_menu.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:minHeight="45dip">
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"/>
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/folder_list.xml b/src/main/res/menu/folder_list.xml
index 10921d70..bceccaaa 100644
--- a/src/main/res/menu/folder_list.xml
+++ b/src/main/res/menu/folder_list.xml
@@ -7,6 +7,6 @@
         android:id="@+id/add_folder"
         android:icon="@drawable/ic_add_white_24dp_active"
         android:title="@string/add_folder"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
 </menu>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index a83afbfc..05dabc01 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">ID adresáře musí být krátký identifikátor (64 znaků nebo méně) obsahující pouze písmena, čísla, tečky (.), pomlčky (-) a podtržítka (_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Cesta k adresáři nesmí být prázdná</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Nejdříve prosím připojte přístroj.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID přístroje</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index f59297a3..c511bd72 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">Die Verzeichnis-ID muss eine kurze Kennung (64 Zeichen oder weniger) sein. Sie kann nur aus Buchstaben, Zahlen und dem Punkt- (.), Bindestrich- (-), und Unterstrich- (_) Zeichen bestehen.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Der Ordnerpfad darf nicht leer sein</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Bitte verbinde zuerst ein Gerät.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">Geräte-ID</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 17fe85a8..f8b1b84a 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">El ID de carpeta tiene que ser un identificador corto (64 caracteres o menos) formado por letras, números y los caracteres como el punto (.), el guión (-) y el subrayado(_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">La ruta a la carpeta no puede estar vacia</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Para empezar conecte un dispositivo, por favor.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID del dispositivo</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 5e9790f1..455e0318 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">L\'ID du dossier doit être un identifiant court (64 caractères ou moins) pouvant contenir les valeurs suivantes: lettres, chiffres, point (.), tiret milieu (-), et tiret-bas (_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Le chemin du dossier ne doit pas être vide</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">SVP, connectez-vous d\'abord à une machine.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID machine</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index cb9b5535..95f021fb 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">L\'ID della cartella dev\'essere un identificatore breve (64 caratteri o meno) costituito solamente da lettere, numeri, punti (.), trattini (-) e trattini bassi (_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Il percorso della cartella non può essere vuoto</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Prima devi connettere un dispositivo.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID Dispositivo</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 78c33761..313cab70 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">フォルダーIDは、文字、数字、ドット (.)、ダッシュ (-)、アンダースコア (_) からなる、短い識別子 (64文字以下) でなければなりません。</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">フォルダーのパスは空にできません</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">まずデバイスに接続してください。</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">デバイス ID</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 8930179e..fcc75d1a 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -74,8 +74,6 @@
   <string name="folder_id_invalid">폴더 ID는 문자, 숫자, 마침표(.), 붙임표(-), 밑줄 문자(_)로만 구성되어 있는 짧은 식별자(64자 이하)여야 합니다.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">폴더 경로를 공백으로 둘 수 없습니다</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">먼저 기기를 연결해 주십시오.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">기기 ID</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index e9c94120..f35b49d5 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">De map-ID moet een korte aanduiding (64 of minder tekens) zijn, bestaande uit enkel letters, cijfers, punten (.), streepjes (-) en onderstrepingstekens (_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Het mappad mag niet leeg zijn</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Verbind eerst met een knooppunt.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">Apparaat-ID</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 8a45a9f6..b8094c98 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -77,8 +77,6 @@
   <string name="folder_id_invalid">Nazwa katalogu musi być krótka (64 lub mniej znaków). Może zawierać tylko litery, cyfry, kropki, myślniki i znak podkreślenia.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Ścieżka do folderu nie może być pusta</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Proszę najpierw podłączyć urządzenie.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID urządzenia</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 7a4deb74..17a62013 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -80,8 +80,6 @@ As estatísticas agregadas estão disponíveis publicamente em https://data.sync
   <string name="folder_id_invalid">O ID da pasta deve ser um nome curto (64 caracteres ou menos) consistindo apenas em letras, números, ponto (.), hífen (-) ou underscore (_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">O caminho da pasta não pode ficar vazio</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Conecte um dispositivo antes, por favor.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID do dispositivo</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index ce7dcc1c..fdd61307 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">O ID da pasta tem que ser um identificador curto (64 caracteres ou menos) consistindo apenas em letras, números e os caracteres ponto (.), hífen (-) e sublinhado (_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">O caminho da pasta não pode estar vazio</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Ligue primeiro um dispositivo, por favor.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID do dispositivo</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 9c48d3fc..c75d36f0 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">ID папки должен быть коротким идентификатором (64 символов или меньше) состоящий из букв, цифр и символов точки (.), тире(-) и подчеркивания (_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Путь к папке не может быть пустым</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Сначала подключите устройство</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID устройства</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index aaa66232..792feb86 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -74,8 +74,6 @@
   <string name="folder_id_invalid">Klasör ID, (64 karakterden daha az) ve sadece harf, sayı, nokta (.), çizgi (-) ve altçizgi (_) karakterleri içermesi gerekir.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Klasör yolu boş olmamalı</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Lütfen önce bir cihaz bağlayın.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">Cihaz ID</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 3fa6c8e7..ab85cd08 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -78,8 +78,6 @@
   <string name="folder_id_invalid">文件夹标识必须由不长于 64 位字符，且仅能包含字母、数字、半角句号（.）、横线（-）和下划线（_）。</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">文件夹路径不得为空</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">请先连接设备</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">设备标识</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 1e7985dd..d1720815 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -71,8 +71,6 @@
   <string name="folder_id_invalid">資料夾識別碼必須為一段只包含半形英文字母、數字、點 (.)、連接符號 (-) 以及底線 (_) 的簡短識別碼 (不多於 64 個字元)</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">資料夾路徑不得為空</string>
-  <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">請先連接至一個裝置。</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">裝置識別碼</string>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index ae11bc78..18d2a79a 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -2,9 +2,7 @@
 <resources>
     <color name="primary">#03A9F4</color>
     <color name="primary_dark">#0288D1</color>
-    <color name="primary_light">#B3E5FC</color>
     <color name="accent">#FFC107</color>
-    <color name="icons">#FFFFFF</color>
     <color name="divider">#1F000000</color>
 
     <color name="text_red">#ffff4444</color>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3acbc26f..3c698ea3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -135,9 +135,6 @@
     <!-- Toast shown when trying to create a folder with an empty path -->
     <string name="folder_path_required">The folder path must not be empty</string>
 
-    <!-- Toast shown when selecting 'devices' if no devices have been added -->
-    <string name="no_devices">Please connect a device first.</string>
-
     <!-- Dialog shown before config export -->
     <string name="dialog_confirm_export">Do you really want to export your configuration? Existing files will be overwritten.</string>
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index c5b3e0fa..58aa7b61 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -40,6 +40,7 @@
     <eat-comment/>
 
     <style name="ThemeOverlay.Syncthing.Toolbar" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:windowBackground">@null</item>
         <item name="colorAccent">@android:color/white</item>
     </style>
 </resources>
diff --git a/src/main/res/xml/folder_settings_create.xml b/src/main/res/xml/folder_settings_create.xml
deleted file mode 100644
index 7af54062..00000000
--- a/src/main/res/xml/folder_settings_create.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <EditTextPreference
-        android:persistent="false"
-        android:key="folder_id"
-        android:title="@string/folder_id" />
-
-    <Preference
-        android:persistent="false"
-        android:key="directory"
-        android:title="@string/directory" />
-
-    <CheckBoxPreference
-        android:persistent="false"
-        android:key="folder_master"
-        android:title="@string/folder_master" />
-
-    <PreferenceScreen
-        android:persistent="false"
-        android:key="devices"
-        android:title="@string/devices" />
-
-    <CheckBoxPreference
-        android:persistent="false"
-        android:key="versioning"
-        android:title="@string/file_versioning" />
-
-    <EditTextPreference
-        android:persistent="false"
-        android:key="versioning_keep"
-        android:title="@string/keep_versions"
-        android:inputType="numberDecimal" />
-
-</PreferenceScreen>