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 @@
+<vector android:height="32dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
+</vector>
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
@@ -81,6 +81,6 @@
         android:contentDescription="@string/settings_icon_description"
         android:padding="8dip"
         app:tint="?attr/colorControlNormal"
-        android:src="@drawable/ic_action_settings_inverted" />
+        android:src="@drawable/ic_settings_white_32dp" />
 
 </LinearLayout>
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
@@ -11,7 +11,7 @@
             android:keyWidth="20%" />
         <Key
             android:codes="1"
-            android:keyIcon="@drawable/ic_action_settings"
+            android:keyIcon="@drawable/ic_settings_white_32dp"
             android:keyWidth="40%" />
         <Key
             android:codes="2"
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
@@ -271,7 +271,7 @@ public class MainActivity extends AppCompatActivity implements SharedPreferences
             addDeviceItem.setCheckable(true);
 
             MenuItem settingsItem = menu.add(Menu.FIRST, MENU_ENTRY_SETTINGS, 1000, R.string.settings);
-            settingsItem.setIcon(R.drawable.ic_action_settings);
+            settingsItem.setIcon(R.drawable.ic_settings_white_32dp);
             settingsItem.setCheckable(true);
 
             //Ids might have changed