diff --git a/CREDITS b/CREDITS
new file mode 100644
index 00000000..6e2901bc
--- /dev/null
+++ b/CREDITS
@@ -0,0 +1,45 @@
+openScale uses open source components. You can find the source code of their open source projects along with license information below.
+I acknowledge and I am grateful to these developers for their contributions to open source.
+
+Project: HelloCharts
+Copyright 2014 Leszek Wach
+Apache License, Version 2.0
+License: https://www.apache.org/licenses/LICENSE-2.0
+Website: https://github.com/lecho/hellocharts-android
+
+Project: Low-Power
+Copyright 2016 Lim Phang Moh
+Creative Commons Attribution-ShareAlike 3.0
+Licnese: https://creativecommons.org/licenses/by-sa/3.0
+Website: https://github.com/rocketscream/Low-Power
+
+Project:  DS3232RTC
+Copyright 2013 Jack Christensen
+Attribution-ShareAlike 4.0 International
+License: https://creativecommons.org/licenses/by-sa/4.0/
+Website: https://github.com/JChristensen/DS3232RTC
+
+Project: I2C_EEPROM & RunningMedian
+Copyright 2015 Rob Tillaart
+License: Released to the public domain
+Website: https://github.com/RobTillaart/Arduino
+
+Project: Arduino Time Library
+Copyright 2009-2014 Michael Margolis
+GNU Lesser General Public License 2.1 or any later version
+License: https://www.gnu.org/licenses/
+Website: https://github.com/PaulStoffregen/Time
+
+Used icons are by flaticon.com (http://www.flaticon.com)
+Attribution 3.0 Unported (CC BY 3.0)
+License: http://creativecommons.org/licenses/by/3.0/
+* Icomoon (https://www.flaticon.com/authors/icomoon)
+* Google (https://www.flaticon.com/authors/google)
+* Robin Kylander (https://www.flaticon.com/authors/robin-kylander) 
+* Freepik (http://www.freepik.com)
+* Scott de Jonge (https://www.flaticon.com/authors/scott-de-jonge)
+* Cursor Creative (https://www.flaticon.com/authors/cursor-creative)
+* Madebyoliver (https://www.flaticon.com/authors/madebyoliver)
+
+Contributors to openScale are listed on:
+https://github.com/oliexdev/openScale/graphs/contributors
diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml
index c63c7166..76d58a74 100644
--- a/android_app/app/src/main/AndroidManifest.xml
+++ b/android_app/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/ic_launcher_openscale"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
diff --git a/android_app/app/src/main/java/com/health/openscale/core/alarm/AlarmHandler.java b/android_app/app/src/main/java/com/health/openscale/core/alarm/AlarmHandler.java
index 253436c3..1e35ae3a 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/alarm/AlarmHandler.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/alarm/AlarmHandler.java
@@ -158,7 +158,7 @@ public class AlarmHandler
                 PendingIntent.getActivity(context, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context);
-        Notification notification = mBuilder.setSmallIcon(R.drawable.ic_launcher)
+        Notification notification = mBuilder.setSmallIcon(R.drawable.ic_launcher_openscale)
                                             .setContentTitle(context.getString(R.string.app_name))
                                             .setContentText(notifyText)
                                             .setAutoCancel(true)
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
index ed7bf042..97581004 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
@@ -65,7 +65,7 @@ public class MainActivity extends ActionBarActivity implements
 	private SectionsPagerAdapter mSectionsPagerAdapter;
 
 	private static boolean firstAppStart = true;
-	private static int bluetoothStatusIcon = R.drawable.bluetooth_disabled;
+	private static int bluetoothStatusIcon = R.drawable.ic_bluetooth_disabled;
 	private static MenuItem bluetoothStatus;
 
 	/**
@@ -86,7 +86,7 @@ public class MainActivity extends ActionBarActivity implements
 		final ActionBar actionBar = getSupportActionBar();
 		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
 
-        actionBar.setLogo(R.drawable.ic_launcher);
+        actionBar.setLogo(R.drawable.ic_launcher_openscale);
         actionBar.setDisplayUseLogoEnabled(true);
         actionBar.setDisplayShowHomeEnabled(true);
 
@@ -173,7 +173,7 @@ public class MainActivity extends ActionBarActivity implements
 		BluetoothAdapter btAdapter = bluetoothManager.getAdapter();
 
 		if (btAdapter == null || !btAdapter.isEnabled()) {
-			setBluetoothStatusIcon(R.drawable.bluetooth_disabled);
+			setBluetoothStatusIcon(R.drawable.ic_bluetooth_disabled);
 			Toast.makeText(getApplicationContext(), "Bluetooth " + getResources().getString(R.string.info_is_not_enable), Toast.LENGTH_SHORT).show();
 
 			Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
@@ -189,14 +189,14 @@ public class MainActivity extends ActionBarActivity implements
 		// Check if Bluetooth 4.x is available
 		if (BluetoothCommunication.getBtDevice(getApplicationContext(), deviceType).isBLE()) {
 			if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
-				setBluetoothStatusIcon(R.drawable.bluetooth_disabled);
+				setBluetoothStatusIcon(R.drawable.ic_bluetooth_disabled);
 				Toast.makeText(getApplicationContext(), "Bluetooth 4.x " + getResources().getString(R.string.info_is_not_available), Toast.LENGTH_SHORT).show();
 				return;
 			}
 		}
 
 		Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_try_connection) + " " + deviceName, Toast.LENGTH_SHORT).show();
-		setBluetoothStatusIcon(R.drawable.bluetooth_searching);
+		setBluetoothStatusIcon(R.drawable.ic_bluetooth_searching);
 
 		OpenScale.getInstance(getApplicationContext()).stopSearchingForBluetooth();
 		OpenScale.getInstance(getApplicationContext()).startSearchingForBluetooth(deviceType, deviceName, callbackBtHandler);
@@ -210,7 +210,7 @@ public class MainActivity extends ActionBarActivity implements
 
 			switch (btStatusCode) {
 				case BT_RETRIEVE_SCALE_DATA:
-					setBluetoothStatusIcon(R.drawable.bluetooth_connection_success);
+					setBluetoothStatusIcon(R.drawable.ic_bluetooth_connection_success);
 					ScaleData scaleBtData = (ScaleData) msg.obj;
 
 					scaleBtData.setConvertedWeight(scaleBtData.getWeight(), OpenScale.getInstance(getApplicationContext()).getSelectedScaleUser().scale_unit);
@@ -218,27 +218,27 @@ public class MainActivity extends ActionBarActivity implements
 					OpenScale.getInstance(getApplicationContext()).addScaleData(scaleBtData);
 					break;
 				case BT_INIT_PROCESS:
-					setBluetoothStatusIcon(R.drawable.bluetooth_connection_success);
+					setBluetoothStatusIcon(R.drawable.ic_bluetooth_connection_success);
 					Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_init), Toast.LENGTH_SHORT).show();
 					Log.d("OpenScale", "Bluetooth initializing");
 					break;
 				case BT_CONNECTION_LOST:
-					setBluetoothStatusIcon(R.drawable.bluetooth_connection_lost);
+					setBluetoothStatusIcon(R.drawable.ic_bluetooth_connection_lost);
 					Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_connection_lost), Toast.LENGTH_SHORT).show();
 					Log.d("OpenScale", "Bluetooth connection lost");
 					break;
 				case BT_NO_DEVICE_FOUND:
-					setBluetoothStatusIcon(R.drawable.bluetooth_connection_lost);
+					setBluetoothStatusIcon(R.drawable.ic_bluetooth_connection_lost);
 					Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_no_device), Toast.LENGTH_SHORT).show();
 					Log.d("OpenScale", "No Bluetooth device found");
 					break;
 				case BT_CONNECTION_ESTABLISHED:
-					setBluetoothStatusIcon(R.drawable.bluetooth_connection_success);
+					setBluetoothStatusIcon(R.drawable.ic_bluetooth_connection_success);
 					Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_connection_successful), Toast.LENGTH_SHORT).show();
 					Log.d("OpenScale", "Bluetooth connection successful established");
 					break;
 				case BT_UNEXPECTED_ERROR:
-					setBluetoothStatusIcon(R.drawable.bluetooth_connection_lost);
+					setBluetoothStatusIcon(R.drawable.ic_bluetooth_connection_lost);
 					Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_connection_error) + ": " + msg.obj, Toast.LENGTH_SHORT).show();
 					Log.e("OpenScale", "Bluetooth unexpected error: " + msg.obj);
 					break;
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/BMIMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/BMIMeasurementView.java
index 9b39b039..ac369984 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/BMIMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/BMIMeasurementView.java
@@ -27,7 +27,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class BMIMeasurementView extends MeasurementView {
 
     public BMIMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_bmi), ContextCompat.getDrawable(context, R.drawable.bmi));
+        super(context, context.getResources().getString(R.string.label_bmi), ContextCompat.getDrawable(context, R.drawable.ic_bmi));
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java
index 42d3a7a8..befeedb6 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java
@@ -29,7 +29,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class CommentMeasurementView extends MeasurementView {
 
     public CommentMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_comment), ContextCompat.getDrawable(context, R.drawable.comment));
+        super(context, context.getResources().getString(R.string.label_comment), ContextCompat.getDrawable(context, R.drawable.ic_comment));
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java
index b90d1cc2..46856382 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java
@@ -34,7 +34,7 @@ public class DateMeasurementView extends MeasurementView {
     private SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy");
 
     public DateMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_date), ContextCompat.getDrawable(context, R.drawable.lastmonth));
+        super(context, context.getResources().getString(R.string.label_date), ContextCompat.getDrawable(context, R.drawable.ic_lastmonth));
     }
 
     private DatePickerDialog.OnDateSetListener datePickerListener = new DatePickerDialog.OnDateSetListener() {
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java
index b32c37a0..447ba2ac 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java
@@ -27,7 +27,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class FatMeasurementView extends MeasurementView {
 
     public FatMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_fat), ContextCompat.getDrawable(context, R.drawable.fat));
+        super(context, context.getResources().getString(R.string.label_fat), ContextCompat.getDrawable(context, R.drawable.ic_fat));
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java
index 25228fa6..2df85795 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java
@@ -27,7 +27,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class HipMeasurementView extends MeasurementView {
 
     public HipMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_hip), ContextCompat.getDrawable(context, R.drawable.hip));
+        super(context, context.getResources().getString(R.string.label_hip), ContextCompat.getDrawable(context, R.drawable.ic_hip));
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
index ce395091..df37253e 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
@@ -107,8 +107,8 @@ public abstract class MeasurementView extends TableLayout {
         addView(measurementRow);
         addView(evaluatorRow);
 
-        iconView.getLayoutParams().height = pxImageDp(30);
         iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+        iconView.setPadding(20,0,20,0);
 
         nameView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
         nameView.setTextColor(Color.BLACK);
@@ -121,8 +121,7 @@ public abstract class MeasurementView extends TableLayout {
         valueView.setPadding(0,0,20,0);
         valueView.setLayoutParams(new TableRow.LayoutParams(0, LayoutParams.MATCH_PARENT, 0.29f));
 
-        editModeView.getLayoutParams().height = pxImageDp(20);
-        editModeView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.editable));
+        editModeView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_editable));
         editModeView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
         editModeView.setVisibility(View.GONE);
 
@@ -183,7 +182,7 @@ public abstract class MeasurementView extends TableLayout {
                 editModeView.setVisibility(View.VISIBLE);
 
                 if (!isEditable()) {
-                    editModeView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.noteditable));
+                    editModeView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_noteeditable));
                 }
 
                 indicatorView.setVisibility(View.GONE);
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MuscleMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MuscleMeasurementView.java
index 3ba9c3a6..ad2f93aa 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/MuscleMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MuscleMeasurementView.java
@@ -27,7 +27,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class MuscleMeasurementView extends MeasurementView {
 
     public MuscleMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_muscle), ContextCompat.getDrawable(context, R.drawable.muscle));
+        super(context, context.getResources().getString(R.string.label_muscle), ContextCompat.getDrawable(context, R.drawable.ic_muscle));
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java
index 66e29654..73def5ff 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java
@@ -34,7 +34,7 @@ public class TimeMeasurementView extends MeasurementView {
     private SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm");
 
     public TimeMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_time), ContextCompat.getDrawable(context, R.drawable.daysleft));
+        super(context, context.getResources().getString(R.string.label_time), ContextCompat.getDrawable(context, R.drawable.ic_daysleft));
     }
 
     private TimePickerDialog.OnTimeSetListener timePickerListener = new TimePickerDialog.OnTimeSetListener() {
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WHRMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WHRMeasurementView.java
index ba5bb13a..34b92e48 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/WHRMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WHRMeasurementView.java
@@ -27,7 +27,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class WHRMeasurementView extends MeasurementView {
 
     public WHRMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_whr), ContextCompat.getDrawable(context, R.drawable.whr));
+        super(context, context.getResources().getString(R.string.label_whr), ContextCompat.getDrawable(context, R.drawable.ic_whr));
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WHtRMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WHtRMeasurementView.java
index 5c7f0a19..1e1f5c4a 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/WHtRMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WHtRMeasurementView.java
@@ -27,7 +27,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class WHtRMeasurementView extends MeasurementView {
 
     public WHtRMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_whtr), ContextCompat.getDrawable(context, R.drawable.whtr));
+        super(context, context.getResources().getString(R.string.label_whtr), ContextCompat.getDrawable(context, R.drawable.ic_whtr));
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WaistMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WaistMeasurementView.java
index be5db3b9..f9a0dcbf 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/WaistMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WaistMeasurementView.java
@@ -27,7 +27,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class WaistMeasurementView extends MeasurementView {
 
     public WaistMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_waist), ContextCompat.getDrawable(context, R.drawable.waist));
+        super(context, context.getResources().getString(R.string.label_waist), ContextCompat.getDrawable(context, R.drawable.ic_waist));
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WaterMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WaterMeasurementView.java
index 7a1e30ad..a153aad8 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/WaterMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WaterMeasurementView.java
@@ -27,7 +27,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class WaterMeasurementView extends MeasurementView {
 
     public WaterMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_water), ContextCompat.getDrawable(context, R.drawable.water));
+        super(context, context.getResources().getString(R.string.label_water), ContextCompat.getDrawable(context, R.drawable.ic_water));
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java
index ca5a1f97..658ef3a3 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java
@@ -28,7 +28,7 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 public class WeightMeasurementView extends MeasurementView {
 
     public WeightMeasurementView(Context context) {
-        super(context, context.getResources().getString(R.string.label_weight), ContextCompat.getDrawable(context, R.drawable.weight));
+        super(context, context.getResources().getString(R.string.label_weight), ContextCompat.getDrawable(context, R.drawable.ic_weight));
     }
 
     @Override
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_connection_lost.png b/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_connection_lost.png
new file mode 100644
index 00000000..f7ea2945
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_connection_lost.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_connection_success.png b/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_connection_success.png
new file mode 100644
index 00000000..a48cd523
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_connection_success.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_disabled.png b/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_disabled.png
new file mode 100644
index 00000000..90dcedb1
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_disabled.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_searching.png b/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_searching.png
new file mode 100644
index 00000000..31ba00b7
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_bluetooth_searching.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_bmi.png b/android_app/app/src/main/res/drawable-hdpi/ic_bmi.png
new file mode 100644
index 00000000..13d6ed3c
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_bmi.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_comment.png b/android_app/app/src/main/res/drawable-hdpi/ic_comment.png
new file mode 100644
index 00000000..9964abab
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_comment.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_daysleft.png b/android_app/app/src/main/res/drawable-hdpi/ic_daysleft.png
new file mode 100644
index 00000000..9df7f878
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_daysleft.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_delete.png b/android_app/app/src/main/res/drawable-hdpi/ic_delete.png
new file mode 100644
index 00000000..7de45a11
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_delete.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_difference.png b/android_app/app/src/main/res/drawable-hdpi/ic_difference.png
new file mode 100644
index 00000000..6501a94f
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_difference.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_editable.png b/android_app/app/src/main/res/drawable-hdpi/ic_editable.png
new file mode 100644
index 00000000..331ff7f4
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_editable.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_expand.png b/android_app/app/src/main/res/drawable-hdpi/ic_expand.png
new file mode 100644
index 00000000..57d91812
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_expand.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_fat.png b/android_app/app/src/main/res/drawable-hdpi/ic_fat.png
new file mode 100644
index 00000000..c40d5d0e
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_fat.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_hip.png b/android_app/app/src/main/res/drawable-hdpi/ic_hip.png
new file mode 100644
index 00000000..7561bbfb
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_hip.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_lastmonth.png b/android_app/app/src/main/res/drawable-hdpi/ic_lastmonth.png
new file mode 100644
index 00000000..bd10ea23
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_lastmonth.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_lastweek.png b/android_app/app/src/main/res/drawable-hdpi/ic_lastweek.png
new file mode 100644
index 00000000..8a15b100
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_lastweek.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_launcher.png b/android_app/app/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 78933cb7..00000000
Binary files a/android_app/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_launcher_openscale.png b/android_app/app/src/main/res/drawable-hdpi/ic_launcher_openscale.png
new file mode 100644
index 00000000..cb68c9cb
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_launcher_openscale.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_muscle.png b/android_app/app/src/main/res/drawable-hdpi/ic_muscle.png
new file mode 100644
index 00000000..ec9125f6
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_muscle.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_noteeditable.png b/android_app/app/src/main/res/drawable-hdpi/ic_noteeditable.png
new file mode 100644
index 00000000..33556939
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_noteeditable.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_backup.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_backup.png
new file mode 100644
index 00000000..d057739a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_backup.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_bluetooth.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_bluetooth.png
new file mode 100644
index 00000000..081832a0
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_bluetooth.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_graph.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_graph.png
new file mode 100644
index 00000000..2051f376
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_graph.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_measurement.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_measurement.png
new file mode 100644
index 00000000..01e63fa1
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_measurement.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_reminder.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_reminder.png
new file mode 100644
index 00000000..fe5117e0
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_reminder.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_users.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_users.png
new file mode 100644
index 00000000..2500b999
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_users.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_target.png b/android_app/app/src/main/res/drawable-hdpi/ic_target.png
new file mode 100644
index 00000000..3a41ee4b
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_target.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_waist.png b/android_app/app/src/main/res/drawable-hdpi/ic_waist.png
new file mode 100644
index 00000000..be735e45
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_waist.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_water.png b/android_app/app/src/main/res/drawable-hdpi/ic_water.png
new file mode 100644
index 00000000..7b977cfb
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_water.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_weight.png b/android_app/app/src/main/res/drawable-hdpi/ic_weight.png
new file mode 100644
index 00000000..f8d73c92
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_weight.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_whr.png b/android_app/app/src/main/res/drawable-hdpi/ic_whr.png
new file mode 100644
index 00000000..d5679d9b
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_whr.png differ
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_whtr.png b/android_app/app/src/main/res/drawable-hdpi/ic_whtr.png
new file mode 100644
index 00000000..26231dce
Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_whtr.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_connection_lost.png b/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_connection_lost.png
new file mode 100644
index 00000000..26d48238
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_connection_lost.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_connection_success.png b/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_connection_success.png
new file mode 100644
index 00000000..218cfcb4
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_connection_success.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_disabled.png b/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_disabled.png
new file mode 100644
index 00000000..4c5d3de1
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_disabled.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_searching.png b/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_searching.png
new file mode 100644
index 00000000..48fe2d24
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_bluetooth_searching.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_bmi.png b/android_app/app/src/main/res/drawable-ldpi/ic_bmi.png
new file mode 100644
index 00000000..ce0ee6e5
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_bmi.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_comment.png b/android_app/app/src/main/res/drawable-ldpi/ic_comment.png
new file mode 100644
index 00000000..3eb8c892
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_comment.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_daysleft.png b/android_app/app/src/main/res/drawable-ldpi/ic_daysleft.png
new file mode 100644
index 00000000..10749296
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_daysleft.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_delete.png b/android_app/app/src/main/res/drawable-ldpi/ic_delete.png
new file mode 100644
index 00000000..815ad1b9
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_delete.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_difference.png b/android_app/app/src/main/res/drawable-ldpi/ic_difference.png
new file mode 100644
index 00000000..f9d4305e
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_difference.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_editable.png b/android_app/app/src/main/res/drawable-ldpi/ic_editable.png
new file mode 100644
index 00000000..30091c54
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_editable.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_expand.png b/android_app/app/src/main/res/drawable-ldpi/ic_expand.png
new file mode 100644
index 00000000..ca229478
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_expand.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_fat.png b/android_app/app/src/main/res/drawable-ldpi/ic_fat.png
new file mode 100644
index 00000000..89f32170
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_fat.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_hip.png b/android_app/app/src/main/res/drawable-ldpi/ic_hip.png
new file mode 100644
index 00000000..f3594b6f
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_hip.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_lastmonth.png b/android_app/app/src/main/res/drawable-ldpi/ic_lastmonth.png
new file mode 100644
index 00000000..ede13ece
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_lastmonth.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_lastweek.png b/android_app/app/src/main/res/drawable-ldpi/ic_lastweek.png
new file mode 100644
index 00000000..d38f60eb
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_lastweek.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_launcher_openscale.png b/android_app/app/src/main/res/drawable-ldpi/ic_launcher_openscale.png
new file mode 100644
index 00000000..3b0a530c
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_launcher_openscale.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_muscle.png b/android_app/app/src/main/res/drawable-ldpi/ic_muscle.png
new file mode 100644
index 00000000..04d66a81
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_muscle.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_noteeditable.png b/android_app/app/src/main/res/drawable-ldpi/ic_noteeditable.png
new file mode 100644
index 00000000..3ff470bf
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_noteeditable.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_backup.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_backup.png
new file mode 100644
index 00000000..cf0f3d06
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_backup.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_bluetooth.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_bluetooth.png
new file mode 100644
index 00000000..bd59ba52
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_bluetooth.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_graph.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_graph.png
new file mode 100644
index 00000000..65d8f7c1
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_graph.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_measurement.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_measurement.png
new file mode 100644
index 00000000..5d0b2b3a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_measurement.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_reminder.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_reminder.png
new file mode 100644
index 00000000..ad05b817
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_reminder.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_users.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_users.png
new file mode 100644
index 00000000..26205740
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_users.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_target.png b/android_app/app/src/main/res/drawable-ldpi/ic_target.png
new file mode 100644
index 00000000..2e88bdb8
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_target.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_waist.png b/android_app/app/src/main/res/drawable-ldpi/ic_waist.png
new file mode 100644
index 00000000..15b5fc2a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_waist.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_water.png b/android_app/app/src/main/res/drawable-ldpi/ic_water.png
new file mode 100644
index 00000000..6a5f555d
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_water.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_weight.png b/android_app/app/src/main/res/drawable-ldpi/ic_weight.png
new file mode 100644
index 00000000..20369823
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_weight.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_whr.png b/android_app/app/src/main/res/drawable-ldpi/ic_whr.png
new file mode 100644
index 00000000..dc646db6
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_whr.png differ
diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_whtr.png b/android_app/app/src/main/res/drawable-ldpi/ic_whtr.png
new file mode 100644
index 00000000..830cac3c
Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_whtr.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_connection_lost.png b/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_connection_lost.png
new file mode 100644
index 00000000..c2fb4ab6
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_connection_lost.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_connection_success.png b/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_connection_success.png
new file mode 100644
index 00000000..79d0e58a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_connection_success.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_disabled.png b/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_disabled.png
new file mode 100644
index 00000000..fdd17c8c
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_disabled.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_searching.png b/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_searching.png
new file mode 100644
index 00000000..f84c3ff7
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_bluetooth_searching.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_bmi.png b/android_app/app/src/main/res/drawable-mdpi/ic_bmi.png
new file mode 100644
index 00000000..17df7081
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_bmi.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_comment.png b/android_app/app/src/main/res/drawable-mdpi/ic_comment.png
new file mode 100644
index 00000000..3db86918
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_comment.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_daysleft.png b/android_app/app/src/main/res/drawable-mdpi/ic_daysleft.png
new file mode 100644
index 00000000..4ac6fb7e
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_daysleft.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_delete.png b/android_app/app/src/main/res/drawable-mdpi/ic_delete.png
new file mode 100644
index 00000000..d3be6533
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_delete.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_difference.png b/android_app/app/src/main/res/drawable-mdpi/ic_difference.png
new file mode 100644
index 00000000..451a2d3d
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_difference.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_editable.png b/android_app/app/src/main/res/drawable-mdpi/ic_editable.png
new file mode 100644
index 00000000..8453ccb9
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_editable.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_expand.png b/android_app/app/src/main/res/drawable-mdpi/ic_expand.png
new file mode 100644
index 00000000..59507644
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_expand.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_fat.png b/android_app/app/src/main/res/drawable-mdpi/ic_fat.png
new file mode 100644
index 00000000..02c3bd0f
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_fat.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_hip.png b/android_app/app/src/main/res/drawable-mdpi/ic_hip.png
new file mode 100644
index 00000000..30eaa082
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_hip.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_lastmonth.png b/android_app/app/src/main/res/drawable-mdpi/ic_lastmonth.png
new file mode 100644
index 00000000..be97a8df
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_lastmonth.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_lastweek.png b/android_app/app/src/main/res/drawable-mdpi/ic_lastweek.png
new file mode 100644
index 00000000..fe5117e0
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_lastweek.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_launcher.png b/android_app/app/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 7245ee34..00000000
Binary files a/android_app/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_launcher_openscale.png b/android_app/app/src/main/res/drawable-mdpi/ic_launcher_openscale.png
new file mode 100644
index 00000000..544a04f5
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_launcher_openscale.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_muscle.png b/android_app/app/src/main/res/drawable-mdpi/ic_muscle.png
new file mode 100644
index 00000000..7e2879b2
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_muscle.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_noteeditable.png b/android_app/app/src/main/res/drawable-mdpi/ic_noteeditable.png
new file mode 100644
index 00000000..ba7d43b6
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_noteeditable.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_backup.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_backup.png
new file mode 100644
index 00000000..67c82a79
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_backup.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_bluetooth.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_bluetooth.png
new file mode 100644
index 00000000..327131ed
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_bluetooth.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_graph.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_graph.png
new file mode 100644
index 00000000..963e6046
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_graph.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_measurement.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_measurement.png
new file mode 100644
index 00000000..d775ebac
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_measurement.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_reminder.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_reminder.png
new file mode 100644
index 00000000..970e6502
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_reminder.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_users.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_users.png
new file mode 100644
index 00000000..b9e86d27
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_users.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_target.png b/android_app/app/src/main/res/drawable-mdpi/ic_target.png
new file mode 100644
index 00000000..bd8a6e46
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_target.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_waist.png b/android_app/app/src/main/res/drawable-mdpi/ic_waist.png
new file mode 100644
index 00000000..792e46ad
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_waist.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_water.png b/android_app/app/src/main/res/drawable-mdpi/ic_water.png
new file mode 100644
index 00000000..fdb29d1c
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_water.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_weight.png b/android_app/app/src/main/res/drawable-mdpi/ic_weight.png
new file mode 100644
index 00000000..b7637926
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_weight.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_whr.png b/android_app/app/src/main/res/drawable-mdpi/ic_whr.png
new file mode 100644
index 00000000..a33ecacd
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_whr.png differ
diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_whtr.png b/android_app/app/src/main/res/drawable-mdpi/ic_whtr.png
new file mode 100644
index 00000000..2500b999
Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_whtr.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_connection_lost.png b/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_connection_lost.png
new file mode 100644
index 00000000..5f54ecbe
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_connection_lost.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_connection_success.png b/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_connection_success.png
new file mode 100644
index 00000000..b3a0b690
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_connection_success.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_disabled.png b/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_disabled.png
new file mode 100644
index 00000000..09f6de4e
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_disabled.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_searching.png b/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_searching.png
new file mode 100644
index 00000000..435c295f
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_bluetooth_searching.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_bmi.png b/android_app/app/src/main/res/drawable-xhdpi/ic_bmi.png
new file mode 100644
index 00000000..9bc67d1a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_bmi.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_comment.png b/android_app/app/src/main/res/drawable-xhdpi/ic_comment.png
new file mode 100644
index 00000000..2956ca0a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_comment.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_daysleft.png b/android_app/app/src/main/res/drawable-xhdpi/ic_daysleft.png
new file mode 100644
index 00000000..5ec7d7d7
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_daysleft.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_delete.png b/android_app/app/src/main/res/drawable-xhdpi/ic_delete.png
new file mode 100644
index 00000000..849d7bc9
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_delete.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_difference.png b/android_app/app/src/main/res/drawable-xhdpi/ic_difference.png
new file mode 100644
index 00000000..8100a5de
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_difference.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_editable.png b/android_app/app/src/main/res/drawable-xhdpi/ic_editable.png
new file mode 100644
index 00000000..4fa4ba23
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_editable.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_expand.png b/android_app/app/src/main/res/drawable-xhdpi/ic_expand.png
new file mode 100644
index 00000000..41961c80
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_expand.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_fat.png b/android_app/app/src/main/res/drawable-xhdpi/ic_fat.png
new file mode 100644
index 00000000..fc98a06d
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_fat.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_hip.png b/android_app/app/src/main/res/drawable-xhdpi/ic_hip.png
new file mode 100644
index 00000000..ca1da507
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_hip.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_lastmonth.png b/android_app/app/src/main/res/drawable-xhdpi/ic_lastmonth.png
new file mode 100644
index 00000000..6a92c486
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_lastmonth.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_lastweek.png b/android_app/app/src/main/res/drawable-xhdpi/ic_lastweek.png
new file mode 100644
index 00000000..208c2eb1
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_lastweek.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_launcher.png b/android_app/app/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 8112b67f..00000000
Binary files a/android_app/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_launcher_openscale.png b/android_app/app/src/main/res/drawable-xhdpi/ic_launcher_openscale.png
new file mode 100644
index 00000000..d3945541
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_launcher_openscale.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_muscle.png b/android_app/app/src/main/res/drawable-xhdpi/ic_muscle.png
new file mode 100644
index 00000000..b7149da8
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_muscle.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_noteeditable.png b/android_app/app/src/main/res/drawable-xhdpi/ic_noteeditable.png
new file mode 100644
index 00000000..3749773e
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_noteeditable.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_backup.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_backup.png
new file mode 100644
index 00000000..3669c8d3
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_backup.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_bluetooth.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_bluetooth.png
new file mode 100644
index 00000000..ad5431b5
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_bluetooth.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_graph.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_graph.png
new file mode 100644
index 00000000..0965cae3
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_graph.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_measurement.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_measurement.png
new file mode 100644
index 00000000..f80ac7c5
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_measurement.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_reminder.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_reminder.png
new file mode 100644
index 00000000..d1701e6d
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_reminder.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_users.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_users.png
new file mode 100644
index 00000000..54fc4763
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_users.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_target.png b/android_app/app/src/main/res/drawable-xhdpi/ic_target.png
new file mode 100644
index 00000000..935e0846
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_target.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_waist.png b/android_app/app/src/main/res/drawable-xhdpi/ic_waist.png
new file mode 100644
index 00000000..d470104c
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_waist.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_water.png b/android_app/app/src/main/res/drawable-xhdpi/ic_water.png
new file mode 100644
index 00000000..3c1e3cff
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_water.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_weight.png b/android_app/app/src/main/res/drawable-xhdpi/ic_weight.png
new file mode 100644
index 00000000..da0fab6f
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_weight.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_whr.png b/android_app/app/src/main/res/drawable-xhdpi/ic_whr.png
new file mode 100644
index 00000000..e83da6d4
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_whr.png differ
diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_whtr.png b/android_app/app/src/main/res/drawable-xhdpi/ic_whtr.png
new file mode 100644
index 00000000..0636e540
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_whtr.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_connection_lost.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_connection_lost.png
new file mode 100644
index 00000000..e7e285f1
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_connection_lost.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_connection_success.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_connection_success.png
new file mode 100644
index 00000000..0645cc7f
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_connection_success.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_disabled.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_disabled.png
new file mode 100644
index 00000000..3176f137
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_disabled.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_searching.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_searching.png
new file mode 100644
index 00000000..42825e65
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_bluetooth_searching.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_bmi.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_bmi.png
new file mode 100644
index 00000000..949e65df
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_bmi.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_comment.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_comment.png
new file mode 100644
index 00000000..945181b9
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_comment.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_daysleft.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_daysleft.png
new file mode 100644
index 00000000..51f918ae
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_daysleft.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_delete.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_delete.png
new file mode 100644
index 00000000..7d38fafb
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_delete.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_difference.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_difference.png
new file mode 100644
index 00000000..bca042dd
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_difference.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_editable.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_editable.png
new file mode 100644
index 00000000..178ef4e4
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_editable.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_expand.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_expand.png
new file mode 100644
index 00000000..c42bc404
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_expand.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_fat.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_fat.png
new file mode 100644
index 00000000..2877c693
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_fat.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_hip.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_hip.png
new file mode 100644
index 00000000..5bbfbb9a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_hip.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_lastmonth.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_lastmonth.png
new file mode 100644
index 00000000..cbf88a36
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_lastmonth.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_lastweek.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_lastweek.png
new file mode 100644
index 00000000..98b17c39
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_lastweek.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 56ea1673..00000000
Binary files a/android_app/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_launcher_openscale.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_launcher_openscale.png
new file mode 100644
index 00000000..ee07a320
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_launcher_openscale.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_muscle.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_muscle.png
new file mode 100644
index 00000000..8368c352
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_muscle.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_noteeditable.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_noteeditable.png
new file mode 100644
index 00000000..0d322611
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_noteeditable.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_backup.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_backup.png
new file mode 100644
index 00000000..53560436
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_backup.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_bluetooth.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_bluetooth.png
new file mode 100644
index 00000000..859e8279
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_bluetooth.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_graph.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_graph.png
new file mode 100644
index 00000000..5769f183
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_graph.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_measurement.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_measurement.png
new file mode 100644
index 00000000..e5d82041
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_measurement.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_reminder.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_reminder.png
new file mode 100644
index 00000000..208c2eb1
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_reminder.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_users.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_users.png
new file mode 100644
index 00000000..0636e540
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_users.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_target.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_target.png
new file mode 100644
index 00000000..b0d565fa
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_target.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_waist.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_waist.png
new file mode 100644
index 00000000..bff1b173
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_waist.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_water.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_water.png
new file mode 100644
index 00000000..2c66bc58
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_water.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_weight.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_weight.png
new file mode 100644
index 00000000..aec8c69b
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_weight.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_whr.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_whr.png
new file mode 100644
index 00000000..febb3532
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_whr.png differ
diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_whtr.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_whtr.png
new file mode 100644
index 00000000..d7a129be
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_whtr.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_connection_lost.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_connection_lost.png
new file mode 100644
index 00000000..822b7081
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_connection_lost.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_connection_success.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_connection_success.png
new file mode 100644
index 00000000..fe0a2247
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_connection_success.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_disabled.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_disabled.png
new file mode 100644
index 00000000..24ef7257
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_disabled.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_searching.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_searching.png
new file mode 100644
index 00000000..325c276c
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_searching.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_bmi.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bmi.png
new file mode 100644
index 00000000..f9384ec8
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_bmi.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_comment.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_comment.png
new file mode 100644
index 00000000..2fc25b0a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_comment.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_daysleft.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_daysleft.png
new file mode 100644
index 00000000..7e860e09
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_daysleft.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_delete.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_delete.png
new file mode 100644
index 00000000..21c97214
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_delete.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_difference.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_difference.png
new file mode 100644
index 00000000..771d179a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_difference.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_editable.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_editable.png
new file mode 100644
index 00000000..f7bdba6d
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_editable.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_expand.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_expand.png
new file mode 100644
index 00000000..f9a07287
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_expand.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_fat.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_fat.png
new file mode 100644
index 00000000..87de23d7
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_fat.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_hip.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_hip.png
new file mode 100644
index 00000000..abe5c65d
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_hip.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_lastmonth.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_lastmonth.png
new file mode 100644
index 00000000..2a293c1e
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_lastmonth.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_lastweek.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_lastweek.png
new file mode 100644
index 00000000..c740a5d3
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_lastweek.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 60690868..00000000
Binary files a/android_app/app/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_launcher_openscale.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_launcher_openscale.png
new file mode 100644
index 00000000..6eba0686
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_launcher_openscale.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_muscle.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_muscle.png
new file mode 100644
index 00000000..fa74b386
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_muscle.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_noteeditable.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_noteeditable.png
new file mode 100644
index 00000000..2ad92c9c
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_noteeditable.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_backup.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_backup.png
new file mode 100644
index 00000000..e0d6dca6
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_backup.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_bluetooth.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_bluetooth.png
new file mode 100644
index 00000000..7311c9fc
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_bluetooth.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_graph.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_graph.png
new file mode 100644
index 00000000..d2ac30c3
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_graph.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_measurement.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_measurement.png
new file mode 100644
index 00000000..4b2a0100
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_measurement.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_reminder.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_reminder.png
new file mode 100644
index 00000000..95068856
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_reminder.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_users.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_users.png
new file mode 100644
index 00000000..6cade9a6
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_users.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_target.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_target.png
new file mode 100644
index 00000000..9a5adbde
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_target.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_waist.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_waist.png
new file mode 100644
index 00000000..eac2f802
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_waist.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_water.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_water.png
new file mode 100644
index 00000000..26e5198b
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_water.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_weight.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_weight.png
new file mode 100644
index 00000000..7f2e2eb0
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_weight.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_whr.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_whr.png
new file mode 100644
index 00000000..55406ea1
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_whr.png differ
diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_whtr.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_whtr.png
new file mode 100644
index 00000000..bd9f6a4a
Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_whtr.png differ
diff --git a/android_app/app/src/main/res/drawable/bluetooth_connection_lost.png b/android_app/app/src/main/res/drawable/bluetooth_connection_lost.png
deleted file mode 100644
index 4a41248d..00000000
Binary files a/android_app/app/src/main/res/drawable/bluetooth_connection_lost.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/bluetooth_connection_success.png b/android_app/app/src/main/res/drawable/bluetooth_connection_success.png
deleted file mode 100644
index 5f429262..00000000
Binary files a/android_app/app/src/main/res/drawable/bluetooth_connection_success.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/bluetooth_disabled.png b/android_app/app/src/main/res/drawable/bluetooth_disabled.png
deleted file mode 100644
index 1d077b5b..00000000
Binary files a/android_app/app/src/main/res/drawable/bluetooth_disabled.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/bluetooth_searching.png b/android_app/app/src/main/res/drawable/bluetooth_searching.png
deleted file mode 100644
index d5022d06..00000000
Binary files a/android_app/app/src/main/res/drawable/bluetooth_searching.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/bmi.png b/android_app/app/src/main/res/drawable/bmi.png
deleted file mode 100644
index eab7c023..00000000
Binary files a/android_app/app/src/main/res/drawable/bmi.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/comment.png b/android_app/app/src/main/res/drawable/comment.png
deleted file mode 100644
index 0c648e3a..00000000
Binary files a/android_app/app/src/main/res/drawable/comment.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/daysleft.png b/android_app/app/src/main/res/drawable/daysleft.png
deleted file mode 100644
index 60e85705..00000000
Binary files a/android_app/app/src/main/res/drawable/daysleft.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/delete.png b/android_app/app/src/main/res/drawable/delete.png
deleted file mode 100644
index b3753f3a..00000000
Binary files a/android_app/app/src/main/res/drawable/delete.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/difference.png b/android_app/app/src/main/res/drawable/difference.png
deleted file mode 100644
index e5f0b9d8..00000000
Binary files a/android_app/app/src/main/res/drawable/difference.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/editable.png b/android_app/app/src/main/res/drawable/editable.png
deleted file mode 100644
index 017d8532..00000000
Binary files a/android_app/app/src/main/res/drawable/editable.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/expand.png b/android_app/app/src/main/res/drawable/expand.png
deleted file mode 100644
index ca2424c1..00000000
Binary files a/android_app/app/src/main/res/drawable/expand.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/fat.png b/android_app/app/src/main/res/drawable/fat.png
deleted file mode 100644
index 395981ed..00000000
Binary files a/android_app/app/src/main/res/drawable/fat.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/hip.png b/android_app/app/src/main/res/drawable/hip.png
deleted file mode 100644
index 08bec0af..00000000
Binary files a/android_app/app/src/main/res/drawable/hip.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/lastmonth.png b/android_app/app/src/main/res/drawable/lastmonth.png
deleted file mode 100644
index 2a8eb7a1..00000000
Binary files a/android_app/app/src/main/res/drawable/lastmonth.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/lastweek.png b/android_app/app/src/main/res/drawable/lastweek.png
deleted file mode 100644
index f76cdbfe..00000000
Binary files a/android_app/app/src/main/res/drawable/lastweek.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/muscle.png b/android_app/app/src/main/res/drawable/muscle.png
deleted file mode 100644
index 915c57dc..00000000
Binary files a/android_app/app/src/main/res/drawable/muscle.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/noteditable.png b/android_app/app/src/main/res/drawable/noteditable.png
deleted file mode 100644
index 08fb005a..00000000
Binary files a/android_app/app/src/main/res/drawable/noteditable.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/preferences_backup.png b/android_app/app/src/main/res/drawable/preferences_backup.png
deleted file mode 100644
index 3da295cd..00000000
Binary files a/android_app/app/src/main/res/drawable/preferences_backup.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/preferences_bluetooth.png b/android_app/app/src/main/res/drawable/preferences_bluetooth.png
deleted file mode 100644
index e261f36e..00000000
Binary files a/android_app/app/src/main/res/drawable/preferences_bluetooth.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/preferences_graph.png b/android_app/app/src/main/res/drawable/preferences_graph.png
deleted file mode 100644
index 8f59d0bc..00000000
Binary files a/android_app/app/src/main/res/drawable/preferences_graph.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/preferences_measurement.png b/android_app/app/src/main/res/drawable/preferences_measurement.png
deleted file mode 100644
index a713de03..00000000
Binary files a/android_app/app/src/main/res/drawable/preferences_measurement.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/preferences_reminder.png b/android_app/app/src/main/res/drawable/preferences_reminder.png
deleted file mode 100644
index 268399d6..00000000
Binary files a/android_app/app/src/main/res/drawable/preferences_reminder.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/preferences_users.png b/android_app/app/src/main/res/drawable/preferences_users.png
deleted file mode 100644
index e4918548..00000000
Binary files a/android_app/app/src/main/res/drawable/preferences_users.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/target.png b/android_app/app/src/main/res/drawable/target.png
deleted file mode 100644
index 0503cdbc..00000000
Binary files a/android_app/app/src/main/res/drawable/target.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/waist.png b/android_app/app/src/main/res/drawable/waist.png
deleted file mode 100644
index a5b6a05a..00000000
Binary files a/android_app/app/src/main/res/drawable/waist.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/water.png b/android_app/app/src/main/res/drawable/water.png
deleted file mode 100644
index 0543a9ea..00000000
Binary files a/android_app/app/src/main/res/drawable/water.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/weight.png b/android_app/app/src/main/res/drawable/weight.png
deleted file mode 100644
index 0c3b5d95..00000000
Binary files a/android_app/app/src/main/res/drawable/weight.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/whr.png b/android_app/app/src/main/res/drawable/whr.png
deleted file mode 100644
index e4790449..00000000
Binary files a/android_app/app/src/main/res/drawable/whr.png and /dev/null differ
diff --git a/android_app/app/src/main/res/drawable/whtr.png b/android_app/app/src/main/res/drawable/whtr.png
deleted file mode 100644
index db60728b..00000000
Binary files a/android_app/app/src/main/res/drawable/whtr.png and /dev/null differ
diff --git a/android_app/app/src/main/res/layout/activity_dataentry.xml b/android_app/app/src/main/res/layout/activity_dataentry.xml
index f759569f..3d9cd32c 100644
--- a/android_app/app/src/main/res/layout/activity_dataentry.xml
+++ b/android_app/app/src/main/res/layout/activity_dataentry.xml
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:clickable="true"
-            android:src="@drawable/editable"
+            android:src="@drawable/ic_editable"
             app:backgroundTint="#D3D3D3"
             app:fabSize="mini" />
 
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:clickable="true"
-            android:src="@drawable/expand"
+            android:src="@drawable/ic_expand"
             app:backgroundTint="#D3D3D3"
             app:fabSize="mini" />
 
@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:clickable="true"
-            android:src="@drawable/delete"
+            android:src="@drawable/ic_delete"
             app:backgroundTint="#FF4444"
             app:fabSize="mini" />
 
diff --git a/android_app/app/src/main/res/layout/fragment_graph.xml b/android_app/app/src/main/res/layout/fragment_graph.xml
index ebd1bb88..4e57f6d2 100644
--- a/android_app/app/src/main/res/layout/fragment_graph.xml
+++ b/android_app/app/src/main/res/layout/fragment_graph.xml
@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:clickable="true"
-            android:src="@drawable/weight"
+            android:src="@drawable/ic_weight"
             app:backgroundTint="#AA66CC"
             app:fabSize="mini"
             app:rippleColor="#AA66CC" />
@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:clickable="true"
-            android:src="@drawable/fat"
+            android:src="@drawable/ic_fat"
             app:backgroundTint="#FFBB33"
             app:fabSize="mini"
             app:rippleColor="#FFBB33" />
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:clickable="true"
-            android:src="@drawable/water"
+            android:src="@drawable/ic_water"
             app:backgroundTint="#33B5E5"
             app:fabSize="mini"
             app:rippleColor="#33B5E5" />
@@ -58,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:clickable="true"
-            android:src="@drawable/muscle"
+            android:src="@drawable/ic_muscle"
             app:backgroundTint="#99CC00"
             app:fabSize="mini"
             app:rippleColor="#99CC00" />
@@ -69,7 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:clickable="true"
-            android:src="@drawable/waist"
+            android:src="@drawable/ic_waist"
             app:backgroundTint="#FF00FF"
             app:fabSize="mini"
             app:rippleColor="#FF00FF" />
@@ -80,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:clickable="true"
-            android:src="@drawable/hip"
+            android:src="@drawable/ic_hip"
             app:backgroundTint="#FFFF00"
             app:fabSize="mini"
             app:rippleColor="#FFFF00" />
@@ -151,7 +151,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:clickable="true"
-        android:src="@drawable/lastmonth"
+        android:src="@drawable/ic_lastmonth"
         app:backgroundTint="#33B5E5"
         app:layout_anchor="@id/chart_bottom"
         app:layout_anchorGravity="bottom|right|end"
diff --git a/android_app/app/src/main/res/layout/fragment_statistics.xml b/android_app/app/src/main/res/layout/fragment_statistics.xml
index 99352833..52838ca9 100644
--- a/android_app/app/src/main/res/layout/fragment_statistics.xml
+++ b/android_app/app/src/main/res/layout/fragment_statistics.xml
@@ -45,7 +45,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="25dp"
                         android:layout_gravity="center"
-                        android:src="@drawable/target" />
+                        android:src="@drawable/ic_target" />
 
                     <TextView
                         android:id="@+id/txtLabelGoalWeight"
@@ -88,7 +88,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="25dp"
                         android:layout_gravity="center"
-                        android:src="@drawable/difference" />
+                        android:src="@drawable/ic_difference" />
 
                     <TextView
                         android:id="@+id/txtLabelGoalDiff"
@@ -131,7 +131,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="25dp"
                         android:layout_gravity="center"
-                        android:src="@drawable/daysleft" />
+                        android:src="@drawable/ic_daysleft" />
 
                     <TextView
                         android:id="@+id/txtLabelDayLeft"
@@ -195,7 +195,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="25dp"
                         android:layout_gravity="center"
-                        android:src="@drawable/lastweek" />
+                        android:src="@drawable/ic_lastweek" />
 
                     <TextView
                         android:id="@+id/txtLabelAvgWeek"
@@ -239,7 +239,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="25dp"
                         android:layout_gravity="center"
-                        android:src="@drawable/lastmonth" />
+                        android:src="@drawable/ic_lastmonth" />
 
                     <TextView
                         android:id="@+id/txtLabelAvgMonth"
diff --git a/android_app/app/src/main/res/menu/main.xml b/android_app/app/src/main/res/menu/main.xml
index 48e52a02..44cc8cb2 100644
--- a/android_app/app/src/main/res/menu/main.xml
+++ b/android_app/app/src/main/res/menu/main.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_bluetooth_status"
-        android:icon="@drawable/bluetooth_disabled"
+        android:icon="@drawable/ic_bluetooth_disabled"
         android:title="@string/action_bluetooth_status"
         app:showAsAction="ifRoom"/>
 
diff --git a/android_app/app/src/main/res/xml/header_preferences.xml b/android_app/app/src/main/res/xml/header_preferences.xml
index 775b25ac..45601994 100644
--- a/android_app/app/src/main/res/xml/header_preferences.xml
+++ b/android_app/app/src/main/res/xml/header_preferences.xml
@@ -3,25 +3,25 @@
     <header
         android:fragment="com.health.openscale.gui.preferences.UsersPreferences"
         android:title="@string/title_users"
-        android:icon="@drawable/preferences_users"/>
+        android:icon="@drawable/ic_preferences_users"/>
     <header
         android:fragment="com.health.openscale.gui.preferences.BluetoothPreferences"
         android:title="@string/label_bluetooth_title"
-        android:icon="@drawable/preferences_bluetooth"/>
+        android:icon="@drawable/ic_preferences_bluetooth"/>
     <header
         android:fragment="com.health.openscale.gui.preferences.MeasurementPreferences"
         android:title="@string/title_measurements"
-        android:icon="@drawable/preferences_measurement"/>
+        android:icon="@drawable/ic_preferences_measurement"/>
     <header
         android:fragment="com.health.openscale.gui.preferences.GraphPreferences"
         android:title="@string/title_graph"
-        android:icon="@drawable/preferences_graph"/>
+        android:icon="@drawable/ic_preferences_graph"/>
     <header
         android:fragment="com.health.openscale.gui.preferences.ReminderPreferences"
         android:title="@string/label_reminder"
-        android:icon="@drawable/preferences_reminder"/>
+        android:icon="@drawable/ic_preferences_reminder"/>
     <header
         android:fragment="com.health.openscale.gui.preferences.BackupPreferences"
         android:title="@string/label_backup"
-        android:icon="@drawable/preferences_backup"/>
+        android:icon="@drawable/ic_preferences_backup"/>
 </preference-headers>
\ No newline at end of file
diff --git a/doc/raw_icons/openScale_icons.zip b/doc/raw_icons/openScale_icons.zip
new file mode 100644
index 00000000..04ba4efa
Binary files /dev/null and b/doc/raw_icons/openScale_icons.zip differ