diff --git a/res/drawable-hdpi/ic_action_settings.png b/res/drawable-hdpi/ic_action_settings.png
deleted file mode 100644
index d3f981d0..00000000
Binary files a/res/drawable-hdpi/ic_action_settings.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_settings_inverted.png b/res/drawable-hdpi/ic_action_settings_inverted.png
deleted file mode 100644
index 8e30d967..00000000
Binary files a/res/drawable-hdpi/ic_action_settings_inverted.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_settings.png b/res/drawable-mdpi/ic_action_settings.png
deleted file mode 100644
index fc2bf8c3..00000000
Binary files a/res/drawable-mdpi/ic_action_settings.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_settings_inverted.png b/res/drawable-mdpi/ic_action_settings_inverted.png
deleted file mode 100644
index 0e65c682..00000000
Binary files a/res/drawable-mdpi/ic_action_settings_inverted.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_settings.png b/res/drawable-xhdpi/ic_action_settings.png
deleted file mode 100644
index 1b9acf26..00000000
Binary files a/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_settings_inverted.png b/res/drawable-xhdpi/ic_action_settings_inverted.png
deleted file mode 100644
index d0a733e5..00000000
Binary files a/res/drawable-xhdpi/ic_action_settings_inverted.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_action_settings.png b/res/drawable-xxhdpi/ic_action_settings.png
deleted file mode 100644
index ded5dbb5..00000000
Binary files a/res/drawable-xxhdpi/ic_action_settings.png and /dev/null differ
diff --git a/res/drawable/ic_settings_white_32dp.xml b/res/drawable/ic_settings_white_32dp.xml
new file mode 100644
index 00000000..fea2ead0
--- /dev/null
+++ b/res/drawable/ic_settings_white_32dp.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/res/layout/preference_with_button.xml b/res/layout/preference_with_button.xml
index d677d6cb..675dcce4 100644
--- a/res/layout/preference_with_button.xml
+++ b/res/layout/preference_with_button.xml
@@ -1,86 +1,86 @@
+ android:src="@drawable/ic_settings_white_32dp" />
diff --git a/res/xml/remotekeyboardplugin_keyboard.xml b/res/xml/remotekeyboardplugin_keyboard.xml
index 8d00febf..3f0c5a72 100644
--- a/res/xml/remotekeyboardplugin_keyboard.xml
+++ b/res/xml/remotekeyboardplugin_keyboard.xml
@@ -1,25 +1,25 @@
-->
diff --git a/src/org/kde/kdeconnect/UserInterface/MainActivity.java b/src/org/kde/kdeconnect/UserInterface/MainActivity.java
index 55d3566f..ab1c6860 100644
--- a/src/org/kde/kdeconnect/UserInterface/MainActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/MainActivity.java
@@ -1,389 +1,389 @@
package org.kde.kdeconnect.UserInterface;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.SubMenu;
import android.view.View;
import android.widget.TextView;
import com.google.android.material.navigation.NavigationView;
import org.kde.kdeconnect.BackgroundService;
import org.kde.kdeconnect.Device;
import org.kde.kdeconnect.Helpers.DeviceHelper;
import org.kde.kdeconnect_tp.R;
import java.util.Collection;
import java.util.HashMap;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import butterknife.BindView;
import butterknife.ButterKnife;
public class MainActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final int MENU_ENTRY_ADD_DEVICE = 1; //0 means no-selection
private static final int MENU_ENTRY_SETTINGS = 2;
private static final int MENU_ENTRY_DEVICE_FIRST_ID = 1000; //All subsequent ids are devices in the menu
private static final int MENU_ENTRY_DEVICE_UNKNOWN = 9999; //It's still a device, but we don't know which one yet
private static final String STATE_SELECTED_MENU_ENTRY = "selected_entry"; //Saved only in onSaveInstanceState
private static final String STATE_SELECTED_DEVICE = "selected_device"; //Saved persistently in preferences
public static final int RESULT_NEEDS_RELOAD = Activity.RESULT_FIRST_USER;
public static final String PAIR_REQUEST_STATUS = "pair_req_status";
public static final String PAIRING_ACCEPTED = "accepted";
public static final String PAIRING_REJECTED = "rejected";
public static final String PAIRING_PENDING = "pending";
public static final String EXTRA_DEVICE_ID = "deviceId";
@BindView(R.id.navigation_drawer) NavigationView mNavigationView;
@BindView(R.id.drawer_layout) DrawerLayout mDrawerLayout;
@BindView(R.id.toolbar) Toolbar mToolbar;
private TextView mNavViewDeviceName;
private String mCurrentDevice;
private int mCurrentMenuEntry;
private SharedPreferences preferences;
private final HashMap