diff --git a/app/lint.xml b/app/lint.xml
index 5cc6467a..032a641d 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -68,4 +68,12 @@
     <issue id="RelativeOverlap">
         <ignore path="src/main/res/layout/activity_first_start.xml" />
     </issue>
+    <!-- Ignore unused drawables -->
+    <issue id="UnusedResources" severity="ignore">
+        <ignore path="src/main/res/drawable-ldpi" />
+        <ignore path="src/main/res/drawable-hdpi" />
+        <ignore path="src/main/res/drawable-xhdpi" />
+        <ignore path="src/main/res/drawable-xxhdpi" />
+        <ignore path="src/main/res/drawable-xxxhdpi" />
+    </issue>
 </lint>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 54aedc12..87c5ba7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -133,6 +133,7 @@
                 android:value=".activities.MainActivity" />
         </activity>
         <activity android:name=".activities.SettingsActivity"
+            android:label="@string/settings_title"
             android:parentActivityName=".activities.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
index 9e83f827..b920cf09 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
@@ -3,14 +3,12 @@ package com.nutomic.syncthingandroid.activities;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.app.UiModeManager;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.Configuration;
 import android.graphics.Color;
 import android.Manifest;
 import android.net.Uri;
@@ -48,7 +46,7 @@ import java.lang.ref.WeakReference;
 
 import javax.inject.Inject;
 
-public class FirstStartActivity extends Activity {
+public class FirstStartActivity extends AppCompatActivity {
 
     private static String TAG = "FirstStartActivity";
     private static final int REQUEST_COARSE_LOCATION = 141;
@@ -97,7 +95,7 @@ public class FirstStartActivity extends Activity {
         super.onCreate(savedInstanceState);
         ((SyncthingApp) getApplication()).component().inject(this);
 
-        mRunningOnTV = isRunningOnTV();
+        mRunningOnTV = Util.isRunningOnTV(this);
         Log.d(TAG, mRunningOnTV ? "Running on a TV Device" : "Running on a non-TV Device");
 
         /**
@@ -489,6 +487,7 @@ public class FirstStartActivity extends Activity {
                 } else {
                     Toast.makeText(this, R.string.permission_granted, Toast.LENGTH_SHORT).show();
                     Log.i(TAG, "User granted ACCESS_COARSE_LOCATION permission.");
+                    mNextButton.requestFocus();
                 }
                 break;
             case REQUEST_WRITE_STORAGE:
@@ -498,6 +497,7 @@ public class FirstStartActivity extends Activity {
                 } else {
                     Toast.makeText(this, R.string.permission_granted, Toast.LENGTH_SHORT).show();
                     Log.i(TAG, "User granted WRITE_EXTERNAL_STORAGE permission.");
+                    mNextButton.requestFocus();
                 }
                 break;
             default:
@@ -570,11 +570,7 @@ public class FirstStartActivity extends Activity {
             keygenStatus.setText(firstStartActivity.getString(R.string.key_generation_success));
             Button nextButton = (Button) firstStartActivity.findViewById(R.id.btn_next);
             nextButton.setVisibility(View.VISIBLE);
+            nextButton.requestFocus();
         }
     }
-
-    private Boolean isRunningOnTV() {
-        UiModeManager uiModeManager = (UiModeManager) getSystemService(UI_MODE_SERVICE);
-        return uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION;
-    }
 }
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
index 84a1dc10..86a1087f 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
@@ -77,6 +77,10 @@ public class MainActivity extends SyncthingActivity
     private static final String QRCODE_BITMAP_KEY = "QRCODE_BITMAP";
     private static final String DEVICEID_KEY = "DEVICEID";
 
+    private static final int FOLDER_FRAGMENT_ID = 0;
+    private static final int DEVICE_FRAGMENT_ID = 1;
+    private static final int STATUS_FRAGMENT_ID = 2;
+
     /**
      * Time after first start when usage reporting dialog should be shown.
      *
@@ -233,11 +237,11 @@ public class MainActivity extends SyncthingActivity
             @Override
             public Fragment getItem(int position) {
                 switch (position) {
-                    case 0:
+                    case FOLDER_FRAGMENT_ID:
                         return mFolderListFragment;
-                    case 1:
+                    case DEVICE_FRAGMENT_ID:
                         return mDeviceListFragment;
-                    case 2:
+                    case STATUS_FRAGMENT_ID:
                         return mStatusFragment;
                     default:
                         return null;
@@ -257,11 +261,11 @@ public class MainActivity extends SyncthingActivity
             @Override
             public CharSequence getPageTitle(int position) {
                 switch (position) {
-                    case 0:
+                    case FOLDER_FRAGMENT_ID:
                         return getResources().getString(R.string.folders_fragment_title);
-                    case 1:
+                    case DEVICE_FRAGMENT_ID:
                         return getResources().getString(R.string.devices_fragment_title);
-                    case 2:
+                    case STATUS_FRAGMENT_ID:
                         return getResources().getString(R.string.status_fragment_title);
                     default:
                         return String.valueOf(position);
@@ -453,7 +457,9 @@ public class MainActivity extends SyncthingActivity
             } else {
                 closeDrawer();
             }
-
+            return true;
+        } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT && mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
+            closeDrawer();
             return true;
         }
         return super.onKeyDown(keyCode, e);
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
index 81cf3030..8875bebf 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
@@ -2,6 +2,7 @@ package com.nutomic.syncthingandroid.activities;
 
 import android.Manifest;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.ComponentName;
@@ -22,8 +23,18 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.TypedValue;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.Toast;
 
@@ -66,12 +77,13 @@ public class SettingsActivity extends SyncthingActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
         mSettingsFragment = new SettingsFragment();
         Bundle bundle = new Bundle();
         bundle.putString(EXTRA_OPEN_SUB_PREF_SCREEN, getIntent().getStringExtra(EXTRA_OPEN_SUB_PREF_SCREEN));
         mSettingsFragment.setArguments(bundle);
         getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, mSettingsFragment)
+                .replace(R.id.prefFragmentContainer, mSettingsFragment)
                 .commit();
     }
 
@@ -104,6 +116,15 @@ public class SettingsActivity extends SyncthingActivity {
         syncthingService.registerOnServiceStateChangeListener(mSettingsFragment);
     }
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent e) {
+        if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
+            finish();
+            return true;
+        }
+        return super.onKeyDown(keyCode, e);
+    }
+
     public static class SettingsFragment extends PreferenceFragment
             implements SyncthingService.OnServiceStateChangeListener,
                 Preference.OnPreferenceChangeListener,
@@ -130,6 +151,8 @@ public class SettingsActivity extends SyncthingActivity {
         @Inject NotificationHandler mNotificationHandler;
         @Inject SharedPreferences mPreferences;
 
+        private Dialog             mCurrentPrefScreenDialog = null;
+
         private Preference         mCategoryRunConditions;
         private CheckBoxPreference mStartServiceOnBoot;
         private ListPreference     mPowerSource;
@@ -184,6 +207,26 @@ public class SettingsActivity extends SyncthingActivity {
         public void onCreate(@Nullable Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             ((SyncthingApp) getActivity().getApplication()).component().inject(this);
+            setHasOptionsMenu(true);
+        }
+
+        /**
+         * The ActionBar overlaps the preferences view.
+         * Move the preferences view below the ActionBar.
+         */
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+            View view = super.onCreateView(inflater, container, savedInstanceState);
+            int horizontalMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, getResources().getDisplayMetrics());
+            int verticalMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, getResources().getDisplayMetrics());
+            TypedValue tv = new TypedValue();
+            if (container.getContext().getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true))
+            {
+                // Calculate ActionBar height
+                int actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics());
+                view.setPadding(horizontalMargin, actionBarHeight, horizontalMargin, verticalMargin);
+            }
+            return view;
         }
 
         /**
@@ -195,6 +238,7 @@ public class SettingsActivity extends SyncthingActivity {
         public void onActivityCreated(Bundle savedInstanceState) {
             mContext = getActivity().getApplicationContext();
             super.onActivityCreated(savedInstanceState);
+
             addPreferencesFromResource(R.xml.app_settings);
             mPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
 
@@ -212,9 +256,9 @@ public class SettingsActivity extends SyncthingActivity {
                     return false;
                 });
             }
+            PreferenceScreen screen = getPreferenceScreen();
 
             /* Run conditions */
-            PreferenceScreen screen = getPreferenceScreen();
             mRunOnWifi =
                     (CheckBoxPreference) findPreference(Constants.PREF_RUN_ON_WIFI);
             mRunOnMeteredWifi =
@@ -349,6 +393,53 @@ public class SettingsActivity extends SyncthingActivity {
             }
         }
 
+        @SuppressWarnings("deprecation")
+        @Override
+        public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+            super.onPreferenceTreeClick(preferenceScreen, preference);
+            if (preference instanceof PreferenceScreen) {
+                // User has clicked on a sub-preferences screen.
+                try {
+                    mCurrentPrefScreenDialog = ((PreferenceScreen) preference).getDialog();
+                    LinearLayout root = (LinearLayout) mCurrentPrefScreenDialog.findViewById(android.R.id.list).getParent().getParent();
+                    SyncthingActivity syncthingActivity = (SyncthingActivity) getActivity();
+                    LayoutInflater layoutInflater = syncthingActivity.getLayoutInflater();
+                    Toolbar toolbar = (Toolbar) layoutInflater.inflate(R.layout.widget_toolbar, root, false);
+                    root.addView(toolbar, 0);
+                    toolbar.setTitle(((PreferenceScreen) preference).getTitle());
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                        toolbar.setTouchscreenBlocksFocus(false);
+                    }
+                    syncthingActivity.setSupportActionBar(toolbar);
+                    syncthingActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+                } catch (Exception e) {
+                    /**
+                     * The above code has been verified working but due to known bugs in the
+                     * support library on different Android versions better be safe in case
+                     * it breaks.
+                     */
+                    Log.e(TAG, "onPreferenceTreeClick", e);
+                }
+            }
+            return false;
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            if (item.getItemId() == android.R.id.home) {
+                if (mCurrentPrefScreenDialog == null) {
+                    // User is on the top preferences screen.
+                    getActivity().onBackPressed();
+                } else {
+                    // User is on a sub-preferences screen.
+                    mCurrentPrefScreenDialog.dismiss();
+                    mCurrentPrefScreenDialog = null;
+                }
+                return true;
+            }
+            return super.onOptionsItemSelected(item);
+        }
+
         public void setService(SyncthingService syncthingService) {
             mSyncthingService = syncthingService;
         }
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java
index 83e19503..98e5b713 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java
@@ -4,6 +4,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v7.app.AppCompatActivity;
@@ -43,6 +44,9 @@ public abstract class SyncthingActivity extends AppCompatActivity implements Ser
             return;
         }
         toolbar.setNavigationContentDescription(R.string.main_menu);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            toolbar.setTouchscreenBlocksFocus(false);
+        }
 
         setSupportActionBar(toolbar);
         //noinspection ConstantConditions
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java b/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java
index 06cda012..0fba09bb 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java
@@ -2,11 +2,13 @@ package com.nutomic.syncthingandroid.util;
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.app.UiModeManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
@@ -329,4 +331,9 @@ public class Util {
         }
         return false;
     }
+
+    public static Boolean isRunningOnTV(Context context) {
+        UiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);
+        return uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION;
+    }
 }
diff --git a/app/src/main/res/color/btn_welcome_slide_color.xml b/app/src/main/res/color/btn_welcome_slide_color.xml
new file mode 100644
index 00000000..87c83457
--- /dev/null
+++ b/app/src/main/res/color/btn_welcome_slide_color.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_pressed="false" android:color="#1565C0" />
+    <item android:state_focused="true" android:state_pressed="true" android:color="#1565C0" />
+    <item android:state_focused="false" android:state_pressed="true" android:color="#000000" />
+    <item android:color="#000000" />
+</selector>
diff --git a/app/src/main/res/drawable-hdpi/ic_device_add_black_24.png b/app/src/main/res/drawable-hdpi/ic_device_add_black_24.png
new file mode 100644
index 00000000..134e02e8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_device_add_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_add_white_24.png b/app/src/main/res/drawable-hdpi/ic_device_add_white_24.png
new file mode 100644
index 00000000..8ebee509
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_device_add_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_edit_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_edit_black_24dp.png
index 3bfaa9e2..9ea077f9 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_file_edit_black_24dp.png and b/app/src/main/res/drawable-hdpi/ic_file_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_folder_edit_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_folder_edit_black_24dp.png
index 0cd74ce0..4a899480 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_folder_edit_black_24dp.png and b/app/src/main/res/drawable-hdpi/ic_folder_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_phonelink_white_24.png b/app/src/main/res/drawable-hdpi/ic_phonelink_white_24.png
new file mode 100644
index 00000000..7a715866
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_phonelink_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_syncthing_logo_black.png b/app/src/main/res/drawable-hdpi/ic_syncthing_logo_black.png
new file mode 100644
index 00000000..18e6cf0f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_syncthing_logo_black.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_device_add_black_24.png b/app/src/main/res/drawable-ldpi/ic_device_add_black_24.png
new file mode 100644
index 00000000..c8207e65
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_device_add_black_24.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_device_add_white_24.png b/app/src/main/res/drawable-ldpi/ic_device_add_white_24.png
new file mode 100644
index 00000000..a372e9f1
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_device_add_white_24.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_file_edit_black_24dp.png b/app/src/main/res/drawable-ldpi/ic_file_edit_black_24dp.png
index c1b706e7..30f0a4b1 100644
Binary files a/app/src/main/res/drawable-ldpi/ic_file_edit_black_24dp.png and b/app/src/main/res/drawable-ldpi/ic_file_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_folder_edit_black_24dp.png b/app/src/main/res/drawable-ldpi/ic_folder_edit_black_24dp.png
index abea0c4a..cf63a9b3 100644
Binary files a/app/src/main/res/drawable-ldpi/ic_folder_edit_black_24dp.png and b/app/src/main/res/drawable-ldpi/ic_folder_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_syncthing_logo_black.png b/app/src/main/res/drawable-ldpi/ic_syncthing_logo_black.png
new file mode 100644
index 00000000..26284147
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_syncthing_logo_black.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_add_black_24.png b/app/src/main/res/drawable-mdpi/ic_device_add_black_24.png
new file mode 100644
index 00000000..2aec1c25
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_device_add_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_add_white_24.png b/app/src/main/res/drawable-mdpi/ic_device_add_white_24.png
new file mode 100644
index 00000000..b4f4ddc6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_device_add_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_edit_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_edit_black_24dp.png
index 663e19a6..c575d931 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_file_edit_black_24dp.png and b/app/src/main/res/drawable-mdpi/ic_file_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_folder_edit_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_folder_edit_black_24dp.png
index 14f1e65f..b9f57124 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_folder_edit_black_24dp.png and b/app/src/main/res/drawable-mdpi/ic_folder_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_phonelink_white_24.png b/app/src/main/res/drawable-mdpi/ic_phonelink_white_24.png
new file mode 100644
index 00000000..13cb912a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_phonelink_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_syncthing_logo_black.png b/app/src/main/res/drawable-mdpi/ic_syncthing_logo_black.png
new file mode 100644
index 00000000..166c45e9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_syncthing_logo_black.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_add_black_24.png b/app/src/main/res/drawable-xhdpi/ic_device_add_black_24.png
new file mode 100644
index 00000000..99961b05
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_device_add_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_add_white_24.png b/app/src/main/res/drawable-xhdpi/ic_device_add_white_24.png
new file mode 100644
index 00000000..9619de49
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_device_add_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_edit_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_edit_black_24dp.png
index 95a30c0f..9b3b5a19 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_file_edit_black_24dp.png and b/app/src/main/res/drawable-xhdpi/ic_file_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_edit_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_folder_edit_black_24dp.png
index b6fa419e..edcb9b43 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_folder_edit_black_24dp.png and b/app/src/main/res/drawable-xhdpi/ic_folder_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_phonelink_white_24.png b/app/src/main/res/drawable-xhdpi/ic_phonelink_white_24.png
new file mode 100644
index 00000000..aaec447d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_phonelink_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_syncthing_logo_black.png b/app/src/main/res/drawable-xhdpi/ic_syncthing_logo_black.png
new file mode 100644
index 00000000..eb55a2aa
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_syncthing_logo_black.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_add_black_24.png b/app/src/main/res/drawable-xxhdpi/ic_device_add_black_24.png
new file mode 100644
index 00000000..dfece8f7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_device_add_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_add_white_24.png b/app/src/main/res/drawable-xxhdpi/ic_device_add_white_24.png
new file mode 100644
index 00000000..32b7ff74
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_device_add_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_edit_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_edit_black_24dp.png
index 3bd5cc77..2aa4e30b 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_file_edit_black_24dp.png and b/app/src/main/res/drawable-xxhdpi/ic_file_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_edit_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_folder_edit_black_24dp.png
index 1bd5b004..5ec4bb08 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_folder_edit_black_24dp.png and b/app/src/main/res/drawable-xxhdpi/ic_folder_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_phonelink_white_24.png b/app/src/main/res/drawable-xxhdpi/ic_phonelink_white_24.png
new file mode 100644
index 00000000..4babdc29
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_phonelink_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_syncthing_logo_black.png b/app/src/main/res/drawable-xxhdpi/ic_syncthing_logo_black.png
new file mode 100644
index 00000000..d19545a2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_syncthing_logo_black.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_device_add_black_24.png b/app/src/main/res/drawable-xxxhdpi/ic_device_add_black_24.png
new file mode 100644
index 00000000..2726ccff
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_device_add_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_device_add_white_24.png b/app/src/main/res/drawable-xxxhdpi/ic_device_add_white_24.png
new file mode 100644
index 00000000..a2d3d3e6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_device_add_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_edit_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_edit_black_24dp.png
index 32bca46e..86be9a3f 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_file_edit_black_24dp.png and b/app/src/main/res/drawable-xxxhdpi/ic_file_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_folder_edit_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_folder_edit_black_24dp.png
index 2c85a310..89298604 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_folder_edit_black_24dp.png and b/app/src/main/res/drawable-xxxhdpi/ic_folder_edit_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_phonelink_white_24.png b/app/src/main/res/drawable-xxxhdpi/ic_phonelink_white_24.png
new file mode 100644
index 00000000..ad46ead8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_phonelink_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_syncthing_logo_black.png b/app/src/main/res/drawable-xxxhdpi/ic_syncthing_logo_black.png
new file mode 100644
index 00000000..958fcc44
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_syncthing_logo_black.png differ
diff --git a/app/src/main/res/drawable/btn_add_device.xml b/app/src/main/res/drawable/btn_add_device.xml
new file mode 100644
index 00000000..bfcbc681
--- /dev/null
+++ b/app/src/main/res/drawable/btn_add_device.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/ic_device_add_black_24" />
+    <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/ic_device_add_white_24" />
+    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/ic_device_add_white_24"/>
+    <item android:drawable="@drawable/ic_device_add_white_24" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_add_folder.xml b/app/src/main/res/drawable/btn_add_folder.xml
new file mode 100644
index 00000000..9ba19ba8
--- /dev/null
+++ b/app/src/main/res/drawable/btn_add_folder.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/ic_folder_add_black_24dp" />
+    <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/ic_add_folder_24dp_white" />
+    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/ic_add_folder_24dp_white"/>
+    <item android:drawable="@drawable/ic_add_folder_24dp_white" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_syncthing_logo.xml b/app/src/main/res/drawable/btn_syncthing_logo.xml
new file mode 100644
index 00000000..cf0563cf
--- /dev/null
+++ b/app/src/main/res/drawable/btn_syncthing_logo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/ic_syncthing_logo_black" />
+    <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/ic_stat_notify" />
+    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/ic_stat_notify"/>
+    <item android:drawable="@drawable/ic_stat_notify" />
+</selector>
diff --git a/app/src/main/res/layout/activity_first_start.xml b/app/src/main/res/layout/activity_first_start.xml
index 40f00fe3..9b416962 100644
--- a/app/src/main/res/layout/activity_first_start.xml
+++ b/app/src/main/res/layout/activity_first_start.xml
@@ -39,20 +39,22 @@
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:background="@null"
                 android:text="@string/back"
-                android:textColor="@android:color/white"
-                android:visibility="gone" />
+                android:visibility="gone"
+                style="@style/Theme.Syncthing.GreyButton" />
 
         <Button
                 android:id="@+id/btn_next"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
-                android:background="@null"
                 android:text="@string/cont"
-                android:textColor="@android:color/white" />
+                style="@style/Theme.Syncthing.GreyButton" >
+                <requestFocus />
+        </Button>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_firststart_ignore_doze_permission.xml b/app/src/main/res/layout/activity_firststart_ignore_doze_permission.xml
index ab5114db..f2074242 100644
--- a/app/src/main/res/layout/activity_firststart_ignore_doze_permission.xml
+++ b/app/src/main/res/layout/activity_firststart_ignore_doze_permission.xml
@@ -33,7 +33,7 @@
             android:text="@string/ignore_doze_permission_title"
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
-            android:textStyle="bold"/>
+            android:textStyle="bold" />
 
         <ImageView
             android:layout_width="58dp"
@@ -55,7 +55,8 @@
             android:paddingEnd="@dimen/grant_button_padding"
             android:paddingRight="@dimen/grant_button_padding"
             android:text="@string/grant_permission"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            style="@style/Theme.Syncthing.GreyButton" />
 
         <TextView
             android:id="@+id/tvIgnoreDozePermissionOsNotice"
diff --git a/app/src/main/res/layout/activity_firststart_location_permission.xml b/app/src/main/res/layout/activity_firststart_location_permission.xml
index 21f18429..92ff59ba 100644
--- a/app/src/main/res/layout/activity_firststart_location_permission.xml
+++ b/app/src/main/res/layout/activity_firststart_location_permission.xml
@@ -66,7 +66,8 @@
                 android:paddingEnd="@dimen/grant_button_padding"
                 android:paddingRight="@dimen/grant_button_padding"
                 android:text="@string/grant_permission"
-                android:textSize="12sp"/>
+                android:textSize="12sp"
+                style="@style/Theme.Syncthing.GreyButton" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_firststart_storage_permission.xml b/app/src/main/res/layout/activity_firststart_storage_permission.xml
index b4dc320a..d18e584a 100644
--- a/app/src/main/res/layout/activity_firststart_storage_permission.xml
+++ b/app/src/main/res/layout/activity_firststart_storage_permission.xml
@@ -54,7 +54,8 @@
             android:paddingEnd="@dimen/grant_button_padding"
             android:paddingRight="@dimen/grant_button_padding"
             android:text="@string/grant_permission"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            style="@style/Theme.Syncthing.GreyButton" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
new file mode 100644
index 00000000..b0230be6
--- /dev/null
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="match_parent"
+        tools:context="com.nutomic.syncthingandroid.activities.SettingsActivity"
+        tools:showIn="@layout/activity_settings">
+
+    <include layout="@layout/widget_toolbar" />
+
+    <LinearLayout
+        android:id="@+id/prefFragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/widget_toolbar.xml b/app/src/main/res/layout/widget_toolbar.xml
index 451b7df4..fd6deb28 100644
--- a/app/src/main/res/layout/widget_toolbar.xml
+++ b/app/src/main/res/layout/widget_toolbar.xml
@@ -21,6 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
+            android:focusable="false"
             android:visibility="gone"
             app:buttonTint="#76ff03"/>
 
@@ -29,6 +30,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
+            android:focusable="false"
             android:visibility="gone"
             app:buttonTint="#fff103"/>
 
@@ -37,9 +39,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
+            android:focusable="false"
             android:visibility="gone"
             app:buttonTint="#ffae03"/>
 
     </RelativeLayout>
 
-</android.support.v7.widget.Toolbar>
\ No newline at end of file
+</android.support.v7.widget.Toolbar>
diff --git a/app/src/main/res/menu/device_list.xml b/app/src/main/res/menu/device_list.xml
index fa1d81ab..56cff8f4 100644
--- a/app/src/main/res/menu/device_list.xml
+++ b/app/src/main/res/menu/device_list.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/add_device"
-        android:icon="@drawable/ic_add_white_24dp_active"
+        android:icon="@drawable/btn_add_device"
         android:title="@string/add_device"
         app:showAsAction="always|withText" />
 
diff --git a/app/src/main/res/menu/folder_list.xml b/app/src/main/res/menu/folder_list.xml
index b03d348d..dc0c5233 100644
--- a/app/src/main/res/menu/folder_list.xml
+++ b/app/src/main/res/menu/folder_list.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/add_folder"
-        android:icon="@drawable/ic_add_white_24dp_active"
+        android:icon="@drawable/btn_add_folder"
         android:title="@string/add_folder"
         app:showAsAction="always|withText" />
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cef3211d..8afc7d4f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -33,6 +33,11 @@
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>
 
+    <!-- Button themes -->
+    <style name="Theme.Syncthing.GreyButton" parent="ThemeOverlay.AppCompat.Light">
+        <item name="android:textColor">@color/btn_welcome_slide_color</item>
+    </style>
+
     <!-- Dialog themes -->
     <eat-comment/>