diff --git a/androbd/src/main/java/com/fr3ts0n/ecu/gui/androbd/DfcItemAdapter.java b/androbd/src/main/java/com/fr3ts0n/ecu/gui/androbd/DfcItemAdapter.java
index 44536217..9981c979 100644
--- a/androbd/src/main/java/com/fr3ts0n/ecu/gui/androbd/DfcItemAdapter.java
+++ b/androbd/src/main/java/com/fr3ts0n/ecu/gui/androbd/DfcItemAdapter.java
@@ -66,7 +66,7 @@ public class DfcItemAdapter extends ObdItemAdapter
 
 		// Show icon
 		ImageView ivIcon = v.findViewById(R.id.obd_icon);
-		ivIcon.setImageResource(android.R.drawable.ic_menu_myplaces);
+		ivIcon.setImageResource(R.drawable.ic_code);
 		try
 		{
 			// Show icon based on code status (pending/permanent/normal)
@@ -74,7 +74,7 @@ public class DfcItemAdapter extends ObdItemAdapter
 			switch(svc)
 			{
 				case ObdProt.OBD_SVC_PENDINGCODES:
-					ivIcon.setImageResource(android.R.drawable.ic_menu_recent_history);
+					ivIcon.setImageResource(R.drawable.ic_history);
 					break;
 
 				case ObdProt.OBD_SVC_PERMACODES:
diff --git a/androbd/src/main/res/color/icon_tint.xml b/androbd/src/main/res/color/icon_tint.xml
new file mode 100644
index 00000000..bb9118e4
--- /dev/null
+++ b/androbd/src/main/res/color/icon_tint.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorControlNormal"/>
+</selector>
diff --git a/androbd/src/main/res/drawable/ic_build.xml b/androbd/src/main/res/drawable/ic_build.xml
new file mode 100644
index 00000000..a31f4fa2
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_build.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_camera.xml b/androbd/src/main/res/drawable/ic_camera.xml
new file mode 100644
index 00000000..7aab8b32
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_camera.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M12,12c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2M12,18c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_chart.xml b/androbd/src/main/res/drawable/ic_chart.xml
index da2aeb18..a95e1512 100644
--- a/androbd/src/main/res/drawable/ic_chart.xml
+++ b/androbd/src/main/res/drawable/ic_chart.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="#A0FFFFFF"
+        android:fillColor="@color/icon_tint"
         android:pathData="M16,11.78L20.24,4.45L21.97,5.45L16.74,14.5L10.23,10.75L5.46,19H22V21H2V3H4V17.54L9.5,8L16,11.78Z"/>
 </vector>
\ No newline at end of file
diff --git a/androbd/src/main/res/drawable/ic_code.xml b/androbd/src/main/res/drawable/ic_code.xml
new file mode 100644
index 00000000..f3885fb2
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_code.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4M14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_delete.xml b/androbd/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 00000000..8dba596e
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7L6,19M19,4h-3.5l-1,-1h-5l-1,1H5v2h14L19,4Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_filter.xml b/androbd/src/main/res/drawable/ic_filter.xml
index 93881a8e..39655c6a 100644
--- a/androbd/src/main/res/drawable/ic_filter.xml
+++ b/androbd/src/main/res/drawable/ic_filter.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="#A0FFFFFF"
+        android:fillColor="@color/icon_tint"
         android:pathData="M3,2H21V2H21V4H20.92L15,9.92V22.91L9,16.91V9.91L3.09,4H3V2M11,16.08L13,18.08V9H13.09L18.09,4H5.92L10.92,9H11V16.08Z"/>
 </vector>
\ No newline at end of file
diff --git a/androbd/src/main/res/drawable/ic_headup.xml b/androbd/src/main/res/drawable/ic_headup.xml
index 7ae6742d..293a1d07 100644
--- a/androbd/src/main/res/drawable/ic_headup.xml
+++ b/androbd/src/main/res/drawable/ic_headup.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="#A0FFFFFF"
+        android:fillColor="@color/icon_tint"
         android:pathData="M11,7V12.11L15.71,14.9L16.5,13.62L12.5,11.25V7M12.5,2C8.97,2 5.91,3.92 4.27,6.77L2,4.5V11H8.5L5.75,8.25C6.96,5.73 9.5,4 12.5,4A7.5,7.5 0 0,1 20,11.5A7.5,7.5 0 0,1 12.5,19C9.23,19 6.47,16.91 5.44,14H3.34C4.44,18.03 8.11,21 12.5,21C17.74,21 22,16.75 22,11.5A9.5,9.5 0 0,0 12.5,2Z"/>
 </vector>
\ No newline at end of file
diff --git a/androbd/src/main/res/drawable/ic_history.xml b/androbd/src/main/res/drawable/ic_history.xml
new file mode 100644
index 00000000..dc99b706
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_history.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9S17.97,3 13,3M12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_info.xml b/androbd/src/main/res/drawable/ic_info.xml
new file mode 100644
index 00000000..a19caa45
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M11,7h2v2h-2V7M11,11h2v6h-2v-6M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2M12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_more.xml b/androbd/src/main/res/drawable/ic_more.xml
new file mode 100644
index 00000000..45130ed8
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_more.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2M12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_save.xml b/androbd/src/main/res/drawable/ic_save.xml
new file mode 100644
index 00000000..760b64fd
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_save.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M17,3H5C3.89,3 3,3.9 3,5V19C3,20.1 3.89,21 5,21H19C20.1,21 21,20.1 21,19V7L17,3M19,19H5V5H16.17L19,7.83V19M12,12C10.34,12 9,13.34 9,15S10.34,18 12,18 15,16.66 15,15 13.66,12 12,12M6,6H15V10H6V6Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_settings.xml b/androbd/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 00000000..a2b87a39
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94M12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6 3.6,1.62 3.6,3.6 -1.62,3.6 -3.6,3.6Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_share.xml b/androbd/src/main/res/drawable/ic_share.xml
new file mode 100644
index 00000000..d2b02a7b
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L7.04,9.81C6.5,9.31 5.79,9 5,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_slideshow.xml b/androbd/src/main/res/drawable/ic_slideshow.xml
new file mode 100644
index 00000000..4461d973
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_slideshow.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M10,8v8l5,-4L10,8M4,2h16c1.1,0 2,0.9 2,2v16c0,1.1 -0.9,2 -2,2H4c-1.1,0 -2,-0.9 -2,-2V4C2,2.9 2.9,2 4,2M4,4v16h16V4L4,4Z"/>
+</vector>
diff --git a/androbd/src/main/res/drawable/ic_speedometer.xml b/androbd/src/main/res/drawable/ic_speedometer.xml
index 191cd40b..205750f2 100644
--- a/androbd/src/main/res/drawable/ic_speedometer.xml
+++ b/androbd/src/main/res/drawable/ic_speedometer.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="#A0FFFFFF"
+        android:fillColor="@color/icon_tint"
         android:pathData="M12,16A3,3 0 0,1 9,13C9,11.88 9.61,10.9 10.5,10.39L20.21,4.77L14.68,14.35C14.18,15.33 13.17,16 12,16M12,3C13.81,3 15.5,3.5 16.97,4.32L14.87,5.53C14,5.19 13,5 12,5A8,8 0 0,0 4,13C4,15.21 4.89,17.21 6.34,18.65H6.35C6.74,19.04 6.74,19.67 6.35,20.06C5.96,20.45 5.32,20.45 4.93,20.07V20.07C3.12,18.26 2,15.76 2,13A10,10 0 0,1 12,3M22,13C22,15.76 20.88,18.26 19.07,20.07V20.07C18.68,20.45 18.05,20.45 17.66,20.06C17.27,19.67 17.27,19.04 17.66,18.65V18.65C19.11,17.2 20,15.21 20,13C20,12 19.81,11 19.46,10.1L20.67,8C21.5,9.5 22,11.18 22,13Z"/>
 </vector>
\ No newline at end of file
diff --git a/androbd/src/main/res/drawable/ic_visibility.xml b/androbd/src/main/res/drawable/ic_visibility.xml
new file mode 100644
index 00000000..84c45774
--- /dev/null
+++ b/androbd/src/main/res/drawable/ic_visibility.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="@color/icon_tint"
+        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5C21.27,7.61 17,4.5 12,4.5M12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5M12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3Z"/>
+</vector>
diff --git a/androbd/src/main/res/layout/obd_item.xml b/androbd/src/main/res/layout/obd_item.xml
index 648b86a0..886e2990 100644
--- a/androbd/src/main/res/layout/obd_item.xml
+++ b/androbd/src/main/res/layout/obd_item.xml
@@ -44,7 +44,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:visibility="gone"
-            android:src="@android:drawable/ic_menu_slideshow" />
+            android:src="@drawable/ic_code" />
 
     </LinearLayout>
 
diff --git a/androbd/src/main/res/menu/chart.xml b/androbd/src/main/res/menu/chart.xml
index 34696cdc..598c9145 100644
--- a/androbd/src/main/res/menu/chart.xml
+++ b/androbd/src/main/res/menu/chart.xml
@@ -7,10 +7,10 @@
         android:id="@+id/snapshot"
         android:title="@string/snapshot"
         android:showAsAction="ifRoom"
-        android:icon="@android:drawable/ic_menu_camera"/>
+        android:icon="@drawable/ic_camera"/>
     <item
         android:id="@+id/share"
         android:title="@string/share"
         android:showAsAction="ifRoom"
-        android:icon="@android:drawable/ic_menu_share"/>
+        android:icon="@drawable/ic_share"/>
 </menu>
\ No newline at end of file
diff --git a/androbd/src/main/res/menu/main.xml b/androbd/src/main/res/menu/main.xml
index 099b99e9..7cc09745 100644
--- a/androbd/src/main/res/menu/main.xml
+++ b/androbd/src/main/res/menu/main.xml
@@ -28,7 +28,7 @@
     <!-- Data Management Group -->
     <item
         android:id="@+id/save"
-        android:icon="@android:drawable/ic_menu_save"
+        android:icon="@drawable/ic_save"
         android:title="@string/save"/>
     <item
         android:id="@+id/load"
@@ -44,21 +44,21 @@
     <!-- Configuration and Management -->
     <item
         android:id="@+id/settings"
-        android:icon="@android:drawable/ic_menu_preferences"
+        android:icon="@drawable/ic_settings"
         android:title="@string/settings" />
     <item
         android:id="@+id/plugin_manager"
-        android:icon="@android:drawable/ic_menu_manage"
+        android:icon="@drawable/ic_build"
         android:title="@string/plugin_manager" />
     <item
         android:id="@+id/reset_preselections"
-        android:icon="@android:drawable/ic_menu_delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/reset_preselections"/>
     
     <!-- OBD Diagnostic Services (Primary feature access) -->
     <item
         android:id="@+id/obd_services"
-        android:icon="@android:drawable/ic_menu_more"
+        android:icon="@drawable/ic_more"
         android:enabled="false"
         android:showAsAction="always"
         android:title="@string/obd_services">
diff --git a/androbd/src/main/res/menu/obd_services.xml b/androbd/src/main/res/menu/obd_services.xml
index d722426a..8c5663b1 100644
--- a/androbd/src/main/res/menu/obd_services.xml
+++ b/androbd/src/main/res/menu/obd_services.xml
@@ -21,34 +21,34 @@
     <item
         android:id="@+id/service_vid_data"
         android:title="@string/obd_veh_info"
-        android:icon="@android:drawable/ic_menu_info_details"/>
+        android:icon="@drawable/ic_info"/>
     
     <!-- Live Data Monitoring -->
     <item
         android:id="@+id/service_data"
         android:title="@string/obd_data"
-        android:icon="@android:drawable/ic_menu_view"/>
+        android:icon="@drawable/ic_visibility"/>
     
     <!-- Diagnostic History and Freeze Frames -->
     <item
         android:id="@+id/service_freezeframes"
         android:enabled="false"
         android:title="@string/service_freezeframes"
-        android:icon="@android:drawable/ic_menu_recent_history"/>
+        android:icon="@drawable/ic_history"/>
     
     <!-- Advanced Test Control -->
     <item
         android:id="@+id/service_testcontrol"
         android:title="@string/service_testcontrol"
-        android:icon="@android:drawable/ic_menu_slideshow"/>
+        android:icon="@drawable/ic_slideshow"/>
     
     <!-- Fault Code Management -->
     <item
         android:id="@+id/service_codes"
         android:title="@string/obd_codes"
-        android:icon="@android:drawable/ic_menu_myplaces"/>
+        android:icon="@drawable/ic_code"/>
     <item
         android:id="@+id/service_clearcodes"
         android:title="@string/obd_clearcodes"
-        android:icon="@android:drawable/ic_menu_delete"/>
+        android:icon="@drawable/ic_delete"/>
 </menu>
\ No newline at end of file
diff --git a/androbd/src/main/res/xml/settings.xml b/androbd/src/main/res/xml/settings.xml
index 79be88ce..98ae198a 100644
--- a/androbd/src/main/res/xml/settings.xml
+++ b/androbd/src/main/res/xml/settings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:icon="@android:drawable/ic_menu_manage"
+                  android:icon="@drawable/ic_build"
                   android:title="@string/settings">
 
     <PreferenceScreen
         android:key="screen_common_settings"
-        android:icon="@android:drawable/ic_menu_manage"
+        android:icon="@drawable/ic_build"
         android:summary="@string/common_settings_description"
         android:title="@string/common_settings">
 
@@ -94,7 +94,7 @@
 
     <PreferenceScreen
         android:key="screen_obd_options"
-        android:icon="@android:drawable/ic_menu_manage"
+        android:icon="@drawable/ic_build"
         android:summary="@string/obd_opt_description"
         android:title="@string/obd_options">
 
@@ -216,7 +216,7 @@
 
     <PreferenceScreen
         android:key="screen_csv_export_options"
-        android:icon="@android:drawable/ic_menu_save"
+        android:icon="@drawable/ic_save"
         android:summary="@string/csv_export_description"
         android:title="@string/csv_export_options"
         >
@@ -258,7 +258,7 @@
 
     <PreferenceScreen
         android:key="screen_development_options"
-        android:icon="@android:drawable/ic_menu_manage"
+        android:icon="@drawable/ic_build"
         android:summary="@string/dev_opt_description"
         android:title="@string/development_options"
         >
@@ -327,12 +327,12 @@
 
     <PreferenceScreen
         android:key="screen_app_info"
-        android:icon="@android:drawable/ic_menu_info_details"
+        android:icon="@drawable/ic_info"
         android:summary="@string/app_version"
         android:title="@string/app_name"
         >
         <Preference
-            android:icon="@android:drawable/ic_menu_info_details"
+            android:icon="@drawable/ic_info"
             android:title="@string/app_name"
             android:summary="@string/copyright_fr3ts0n"
             >
@@ -341,7 +341,7 @@
                 android:data="@string/url_app_mainpage"/>
         </Preference>
         <Preference
-            android:icon="@android:drawable/ic_menu_info_details"
+            android:icon="@drawable/ic_info"
             android:summary="@string/app_version"
             android:title="@string/release_history"
             >
@@ -350,7 +350,7 @@
                 android:data="@string/url_app_releases"/>
         </Preference>
         <Preference
-            android:icon="@android:drawable/ic_menu_info_details"
+            android:icon="@drawable/ic_info"
             android:title="@string/graphic_design"
             android:summary="@string/design_credits"
             >
@@ -359,7 +359,7 @@
                 android:data="https://github.com/anaufalm"/>
         </Preference>
         <Preference
-            android:icon="@android:drawable/ic_menu_info_details"
+            android:icon="@drawable/ic_info"
             android:title="@string/translation_credits"
             >
             <intent
diff --git a/plugin b/plugin
index 3bbf743c..594d36e5 160000
--- a/plugin
+++ b/plugin
@@ -1 +1 @@
-Subproject commit 3bbf743c0e55fa7ebd84097f889a49d0a1619797
+Subproject commit 594d36e5f04baa9d2abc5b7eba9b67eab93cd247