diff --git a/app/build.gradle b/app/build.gradle
index dee4cfe9..1b99d571 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -97,19 +97,6 @@ task copyRepoFiles(type: Copy) {
     }
 }
 
-<<<<<<< HEAD
-def downloadFile(filePath, url, downloadIfExists ) {
-    def f = new File(filePath)
-    if (f.exists() && downloadIfExists){
-        f.delete();
-    }
-    if (!f.exists()) {
-        new URL(url).withInputStream{ i -> f.withOutputStream{ it << i }}
-    }
-}
-
-tasks.copyRepoFiles.execute()
-=======
 // Downloads a file
 def downloadFile(filePath, url, downloadIfExists) {
     def f = new File(filePath)
@@ -120,4 +107,3 @@ def downloadFile(filePath, url, downloadIfExists) {
 }
 
 tasks.copyRepoFiles.execute()
->>>>>>> master
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe8e3163..67edd76a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.dfa.diaspora_android">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.github.dfa.diaspora_android"
+    tools:ignore="GoogleAppIndexingWarning">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -15,7 +17,8 @@
 
         <provider
             android:name="com.github.dfa.diaspora_android.service.HashtagContentProvider"
-            android:authorities="com.github.dfa.diaspora_android.mainactivity" />
+            android:authorities="com.github.dfa.diaspora_android.mainactivity"
+            android:exported="false"/>
 
         <service
             android:name="com.github.dfa.diaspora_android.service.FetchPodsService"
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
index b1c599d2..07887dfa 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
@@ -1,5 +1,6 @@
 package com.github.dfa.diaspora_android.activity;
 
+import android.annotation.SuppressLint;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
 import android.app.FragmentTransaction;
@@ -284,6 +285,7 @@ public class SettingsActivity extends ThemedActivity {
          *
          * @param type 1 -> Primary Color, 2 -> Accent Color
          */
+        @SuppressLint("InflateParams")
         public void showColorPickerDialog(final int type) {
             final AppSettings appSettings = ((App) getActivity().getApplication()).getSettings();
             final Context context = getActivity();
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
index 663ae5f4..3286d7ea 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
@@ -1,6 +1,7 @@
 package com.github.dfa.diaspora_android.ui;
 
 
+import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -9,6 +10,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.RadioGroup;
@@ -93,6 +95,12 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
     @BindView(R.id.podselection__dialog__text_protocol)
     TextView textProtocol;
 
+    @BindView(R.id.podselection__dialog__btn_ok)
+    Button btnOk;
+
+    @BindView(R.id.podselection__dialog__btn_cancel)
+    Button btnCancel;
+
     private PodSelectionDialogResultListener resultListener;
     private View root;
     private DiasporaPod pod = new DiasporaPod();
@@ -100,6 +108,7 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
 
     @NonNull
     @Override
+    @SuppressLint("InflateParams")
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         LayoutInflater inflater = getActivity().getLayoutInflater();
@@ -135,6 +144,8 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
         textProfile.setTextColor(ThemeHelper.getAccentColor());
         textProtocol.setTextColor(ThemeHelper.getAccentColor());
         textTorPreset.setTextColor(ThemeHelper.getAccentColor());
+        btnOk.setTextColor(ThemeHelper.getAccentColor());
+        btnCancel.setTextColor(ThemeHelper.getAccentColor());
 
         ThemeHelper.updateEditTextColor(editPodAddress);
         ThemeHelper.updateEditTextColor(editPodName);
diff --git a/app/src/main/res/layout/main__nav_header.xml b/app/src/main/res/layout/main__nav_header.xml
index d3294497..39003d1e 100644
--- a/app/src/main/res/layout/main__nav_header.xml
+++ b/app/src/main/res/layout/main__nav_header.xml
@@ -1,9 +1,9 @@
 <?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:id="@+id/nav_drawer"
     android:layout_width="wrap_content"
     android:layout_height="110dp"
-    android:background="@color/colorPrimary"
     android:gravity="bottom"
     android:orientation="vertical"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
@@ -36,7 +36,8 @@
             android:layout_marginEnd="@dimen/activity_horizontal_margin_half"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_launcher" />
+            android:src="@drawable/ic_launcher"
+            tools:ignore="ContentDescription" />
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/podselection__dialog.xml b/app/src/main/res/layout/podselection__dialog.xml
index d51a31e9..78c55580 100644
--- a/app/src/main/res/layout/podselection__dialog.xml
+++ b/app/src/main/res/layout/podselection__dialog.xml
@@ -11,6 +11,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        style="?android:attr/buttonBarStyle"
         android:orientation="vertical">
 
         <TextView
@@ -88,14 +89,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="http" />
+                android:text="@string/http" />
 
             <RadioButton
                 android:id="@+id/podselection__dialog__radio_https"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="https" />
+                android:text="@string/https" />
         </RadioGroup>
 
         <TextView
@@ -127,6 +128,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                style="?android:attr/buttonBarButtonStyle"
                 android:text="@android:string/cancel" />
 
             <Button
@@ -134,6 +136,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                style="?android:attr/buttonBarButtonStyle"
                 android:text="@android:string/ok" />
         </LinearLayout>
 
diff --git a/app/src/main/res/menu/main__menu_bottom.xml b/app/src/main/res/menu/main__menu_bottom.xml
index 40660f38..a6b310f1 100644
--- a/app/src/main/res/menu/main__menu_bottom.xml
+++ b/app/src/main/res/menu/main__menu_bottom.xml
@@ -1,7 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context=".activity.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
 
     <item
diff --git a/app/src/main/res/menu/main__menu_top.xml b/app/src/main/res/menu/main__menu_top.xml
index d778143b..81575627 100644
--- a/app/src/main/res/menu/main__menu_top.xml
+++ b/app/src/main/res/menu/main__menu_top.xml
@@ -1,7 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context=".activity.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:id="@+id/action_notifications"
diff --git a/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml b/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml
index 1dd4ad4f..9c0f7ffa 100644
--- a/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml
+++ b/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml
@@ -1,7 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context=".activity.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:id="@+id/action_notifications"
diff --git a/app/src/main/res/menu/stream__menu_bottom.xml b/app/src/main/res/menu/stream__menu_bottom.xml
index 84572cdd..641a0e08 100644
--- a/app/src/main/res/menu/stream__menu_bottom.xml
+++ b/app/src/main/res/menu/stream__menu_bottom.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:icon="@drawable/ic_share_white_48px"
diff --git a/app/src/main/res/menu/stream__menu_top.xml b/app/src/main/res/menu/stream__menu_top.xml
index fe316b97..f2d8ee30 100644
--- a/app/src/main/res/menu/stream__menu_top.xml
+++ b/app/src/main/res/menu/stream__menu_top.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-
     <item
         android:id="@+id/action_reload"
         android:icon="@drawable/ic_refresh_white_48px"
         android:orderInCategory="1000"
         android:title="@string/reload"
         app:showAsAction="always" />
-
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index 14025f63..c08cf7b3 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources">
+
     <color name="colorPrimary">@color/md_blue_650</color>
     <color name="colorPrimaryDark">@color/md_blue_750</color>
     <color name="colorAccent">@color/md_deep_orange_650</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7854b617..ed1e9193 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -120,6 +120,8 @@
     <string name="podselection__custom_pod">Custom Pod</string>
     <string name="pod_name">Pod name</string>
     <string name="http_protocol">Protocol</string>
+    <string name="http" translatable="false">http</string>
+    <string name="https" translatable="false">https</string>
     <string name="pod_address">Pod address</string>
     <string name="missing_value">Missing value</string>
 </resources>