diff --git a/.idea/dictionaries/t.xml b/.idea/dictionaries/t.xml
index 100bc79a79..27365b575a 100644
--- a/.idea/dictionaries/t.xml
+++ b/.idea/dictionaries/t.xml
@@ -30,6 +30,7 @@
       <w>carsten</w>
       <w>chamorro</w>
       <w>codeberg</w>
+      <w>colmi</w>
       <w>criogenic</w>
       <w>croisez</w>
       <w>dakhno</w>
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesFilter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesFilter.java
index 17521a44b0..0b745b0708 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesFilter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesFilter.java
@@ -386,14 +386,14 @@ public class ActivitySummariesFilter extends AbstractGBActivity {
         GBApplication gbApp = (GBApplication) appContext;
         LinkedHashMap<String, Pair<Long, Integer>> newMap = new LinkedHashMap<>(1);
         List<? extends GBDevice> devices = gbApp.getDeviceManager().getDevices();
-        newMap.put(getString(R.string.activity_summaries_all_devices), new Pair<>(ALL_DEVICES, R.drawable.ic_device_default_disabled));
+        newMap.put(getString(R.string.activity_summaries_all_devices), new Pair<>(ALL_DEVICES, R.drawable.ic_device_default));
 
         try (DBHandler handler = GBApplication.acquireDB()) {
             daoSession = handler.getDaoSession();
             for (GBDevice device : devices) {
                 DeviceCoordinator coordinator = device.getType().getDeviceCoordinator();
                 Device dbDevice = DBHelper.findDevice(device, daoSession);
-                int icon = device.getEnabledDisabledIconResource();
+                int icon = device.getDeviceCoordinator().getDefaultIconResource();
                 if (dbDevice != null && coordinator != null
                         && coordinator.supportsActivityTracks()
                         && !newMap.containsKey(device.getAliasOrName())) {
@@ -402,7 +402,7 @@ public class ActivitySummariesFilter extends AbstractGBActivity {
             }
 
         } catch (Exception e) {
-            LOG.debug("Error getting list of all devices: " + e);
+            LOG.error("Error getting list of all devices", e);
         }
         return newMap;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java
index dac71e1f06..69eea1bc97 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java
@@ -21,6 +21,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.DatePicker;
@@ -43,7 +45,6 @@ import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 
 public class BatteryInfoActivity extends AbstractGBActivity {
     private static final Logger LOG = LoggerFactory.getLogger(BatteryInfoActivity.class);
@@ -90,15 +91,15 @@ public class BatteryInfoActivity extends AbstractGBActivity {
 
         batteryInfoChartFragment.setDateAndGetData(gbDevice, batteryIndex, timeFrom, timeTo);
 
-        TextView battery_status_device_name_text = (TextView) findViewById(R.id.battery_status_device_name);
-        battery_status_battery_voltage = (TextView) findViewById(R.id.battery_status_battery_voltage);
-        TextView battery_status_extra_name = (TextView) findViewById(R.id.battery_status_extra_name);
-        final TextView battery_status_date_from_text = (TextView) findViewById(R.id.battery_status_date_from_text);
-        final TextView battery_status_date_to_text = (TextView) findViewById(R.id.battery_status_date_to_text);
-        final SeekBar battery_status_time_span_seekbar = (SeekBar) findViewById(R.id.battery_status_time_span_seekbar);
-        final TextView battery_status_time_span_text = (TextView) findViewById(R.id.battery_status_time_span_text);
+        TextView battery_status_device_name_text = findViewById(R.id.battery_status_device_name);
+        battery_status_battery_voltage = findViewById(R.id.battery_status_battery_voltage);
+        TextView battery_status_extra_name = findViewById(R.id.battery_status_extra_name);
+        final TextView battery_status_date_from_text = findViewById(R.id.battery_status_date_from_text);
+        final TextView battery_status_date_to_text = findViewById(R.id.battery_status_date_to_text);
+        final SeekBar battery_status_time_span_seekbar = findViewById(R.id.battery_status_time_span_seekbar);
+        final TextView battery_status_time_span_text = findViewById(R.id.battery_status_time_span_text);
 
-        LinearLayout battery_status_date_to_layout = (LinearLayout) findViewById(R.id.battery_status_date_to_layout);
+        LinearLayout battery_status_date_to_layout = findViewById(R.id.battery_status_date_to_layout);
 
         battery_status_time_span_seekbar.setMax(5);
         battery_status_time_span_seekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@@ -188,8 +189,16 @@ public class BatteryInfoActivity extends AbstractGBActivity {
         DeviceCoordinator coordinator = gbDevice.getDeviceCoordinator();
 
         ImageView battery_status_device_icon = findViewById(R.id.battery_status_device_icon);
-        battery_status_device_icon.setImageResource(gbDevice.getEnabledDisabledIconResource());
-        battery_status_battery_level_text = (TextView) findViewById(R.id.battery_status_battery_level);
+        battery_status_device_icon.setImageResource(gbDevice.getDeviceCoordinator().getDefaultIconResource());
+        if (gbDevice.isInitialized()) {
+            battery_status_device_icon.setColorFilter(null);
+        } else {
+            final ColorMatrix colorMatrix = new ColorMatrix();
+            colorMatrix.setSaturation(0);
+
+            battery_status_device_icon.setColorFilter(new ColorMatrixColorFilter(colorMatrix));
+        }
+        battery_status_battery_level_text = findViewById(R.id.battery_status_battery_level);
         battery_status_device_name_text.setText(gbDevice.getAliasOrName());
 
         setBatteryLabels();
@@ -218,10 +227,10 @@ public class BatteryInfoActivity extends AbstractGBActivity {
     BroadcastReceiver commandReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            LOG.debug("device receiver received " + intent.getAction());
-            if (intent.getAction().equals(GBDevice.ACTION_DEVICE_CHANGED)) {
+            LOG.debug("device receiver received {}", intent.getAction());
+            if (GBDevice.ACTION_DEVICE_CHANGED.equals(intent.getAction())) {
                 GBDevice newDevice = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);
-                if (newDevice.equals(gbDevice)) {
+                if (gbDevice.equals(newDevice)) {
                     gbDevice = newDevice;
                     setBatteryLabels();
                 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java
index e7cc18e24e..f08470f294 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java
@@ -19,36 +19,24 @@ package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Activity;
 import android.appwidget.AppWidgetManager;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Pair;
 import android.widget.ListView;
 
 import androidx.appcompat.app.AlertDialog;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
-import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
-import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.WidgetPreferenceStorage;
 
 public class SleepAlarmWidgetConfigurationActivity extends Activity implements GBActivity {
@@ -57,10 +45,9 @@ public class SleepAlarmWidgetConfigurationActivity extends Activity implements G
     // if we knew which widget is calling this config activity, we could only use a single configuration
     // activity and customize the filter in getAllDevices based on the caller.
 
-    private static final Logger LOG = LoggerFactory.getLogger(SleepAlarmWidgetConfigurationActivity.class);
     int mAppWidgetId;
 
-    LinkedHashMap<String, Pair<String, Integer>> allDevices;
+    List<GBDevice> allDevices;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -79,10 +66,9 @@ public class SleepAlarmWidgetConfigurationActivity extends Activity implements G
                     AppWidgetManager.INVALID_APPWIDGET_ID);
         }
         // make the result intent and set the result to canceled
-        Intent resultValue;
-        resultValue = new Intent();
-        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
-        setResult(RESULT_CANCELED, resultValue);
+        Intent resultValueCanceled = new Intent();
+        resultValueCanceled.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
+        setResult(RESULT_CANCELED, resultValueCanceled);
 
         if (mAppWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
             finish();
@@ -91,31 +77,31 @@ public class SleepAlarmWidgetConfigurationActivity extends Activity implements G
         MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(SleepAlarmWidgetConfigurationActivity.this);
         builder.setTitle(R.string.widget_settings_select_device_title);
 
-        allDevices = getAllDevices(getApplicationContext());
+        allDevices = GBApplication.app().getDeviceManager().getDevices().stream()
+                .filter(device -> {
+                    final DeviceCoordinator coordinator = device.getDeviceCoordinator();
+                    return coordinator.getAlarmSlotCount(device) > 0;
+                }).collect(Collectors.toList());
 
         List<String> list = new ArrayList<>();
-        for (Map.Entry<String, Pair<String, Integer>> item : allDevices.entrySet()) {
-            list.add(item.getKey());
+        for (GBDevice dev : allDevices) {
+            list.add(dev.getAliasOrName());
         }
         String[] allDevicesString = list.toArray(new String[0]);
 
-        builder.setSingleChoiceItems(allDevicesString, 0, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                ListView lw = ((AlertDialog) dialog).getListView();
-                int selectedItemPosition = lw.getCheckedItemPosition();
+        builder.setSingleChoiceItems(allDevicesString, 0, (dialog, which) -> {
+            ListView lw = ((AlertDialog) dialog).getListView();
+            int selectedItemPosition = lw.getCheckedItemPosition();
 
-                if (selectedItemPosition > -1) {
-                    Map.Entry<String, Pair<String, Integer>> selectedItem =
-                            (Map.Entry<String, Pair<String, Integer>>) allDevices.entrySet().toArray()[selectedItemPosition];
-                    WidgetPreferenceStorage widgetPreferenceStorage = new WidgetPreferenceStorage();
-                    widgetPreferenceStorage.saveWidgetPrefs(getApplicationContext(), String.valueOf(mAppWidgetId), selectedItem.getValue().first);
-                }
-                Intent resultValue = new Intent();
-                resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
-                setResult(RESULT_OK, resultValue);
-                finish();
+            if (selectedItemPosition > -1) {
+                final GBDevice selectedItem = allDevices.get(selectedItemPosition);
+                WidgetPreferenceStorage widgetPreferenceStorage = new WidgetPreferenceStorage();
+                widgetPreferenceStorage.saveWidgetPrefs(getApplicationContext(), String.valueOf(mAppWidgetId), selectedItem.getAddress());
             }
+            Intent resultValueOk = new Intent();
+            resultValueOk.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
+            setResult(RESULT_OK, resultValueOk);
+            finish();
         });
         builder.setCancelable(false);
 
@@ -123,30 +109,6 @@ public class SleepAlarmWidgetConfigurationActivity extends Activity implements G
         dialog.show();
     }
 
-    public LinkedHashMap getAllDevices(Context appContext) {
-        DaoSession daoSession;
-        GBApplication gbApp = (GBApplication) appContext;
-        LinkedHashMap<String, Pair<String, Integer>> newMap = new LinkedHashMap<>(1);
-        List<? extends GBDevice> devices = gbApp.getDeviceManager().getDevices();
-
-        try (DBHandler handler = GBApplication.acquireDB()) {
-            daoSession = handler.getDaoSession();
-            for (GBDevice device : devices) {
-                DeviceCoordinator coordinator = device.getDeviceCoordinator();
-                Device dbDevice = DBHelper.findDevice(device, daoSession);
-                int icon = device.getEnabledDisabledIconResource();
-                if (dbDevice != null && coordinator != null
-                        && (coordinator.getAlarmSlotCount(device) > 0)
-                        && !newMap.containsKey(device.getAliasOrName())) {
-                    newMap.put(device.getAliasOrName(), new Pair(device.getAddress(), icon));
-                }
-            }
-        } catch (Exception e) {
-            LOG.error("Error getting list of all devices: " + e);
-        }
-        return newMap;
-    }
-
     @Override
     public void setLanguage(Locale language, boolean invalidateLanguage) {
         AndroidUtils.setLanguage(this, language);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java
index 056411c97f..68c17bc6bd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java
@@ -18,43 +18,30 @@ package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Activity;
 import android.appwidget.AppWidgetManager;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Pair;
 import android.widget.ListView;
 
 import androidx.appcompat.app.AlertDialog;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
-import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
-import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.WidgetPreferenceStorage;
 
 public class WidgetConfigurationActivity extends Activity implements GBActivity {
-    private static final Logger LOG = LoggerFactory.getLogger(WidgetConfigurationActivity.class);
     int mAppWidgetId;
 
-    LinkedHashMap<String, Pair<String, Integer>> allDevices;
+    List<GBDevice> allDevices;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -73,9 +60,9 @@ public class WidgetConfigurationActivity extends Activity implements GBActivity
                     AppWidgetManager.INVALID_APPWIDGET_ID);
         }
         // make the result intent and set the result to canceled
-        Intent resultValue; resultValue = new Intent();
-        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
-        setResult(RESULT_CANCELED, resultValue);
+        Intent resultValueCanceled = new Intent();
+        resultValueCanceled.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
+        setResult(RESULT_CANCELED, resultValueCanceled);
 
         if (mAppWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
             finish();
@@ -84,31 +71,31 @@ public class WidgetConfigurationActivity extends Activity implements GBActivity
         MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(WidgetConfigurationActivity.this);
         builder.setTitle(R.string.widget_settings_select_device_title);
 
-        allDevices = getAllDevices(getApplicationContext());
+        allDevices = GBApplication.app().getDeviceManager().getDevices().stream()
+                .filter(device -> {
+                    final DeviceCoordinator coordinator = device.getDeviceCoordinator();
+                    return coordinator.supportsActivityDataFetching() || coordinator.supportsActivityTracking();
+                }).collect(Collectors.toList());
 
         List<String> list = new ArrayList<>();
-        for (Map.Entry<String, Pair<String, Integer>> item : allDevices.entrySet()) {
-            list.add(item.getKey());
+        for (GBDevice dev : allDevices) {
+            list.add(dev.getAliasOrName());
         }
         String[] allDevicesString = list.toArray(new String[0]);
 
-        builder.setSingleChoiceItems(allDevicesString, 0, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                ListView lw = ((AlertDialog) dialog).getListView();
-                int selectedItemPosition = lw.getCheckedItemPosition();
+        builder.setSingleChoiceItems(allDevicesString, 0, (dialog, which) -> {
+            ListView lw = ((AlertDialog) dialog).getListView();
+            int selectedItemPosition = lw.getCheckedItemPosition();
 
-                if (selectedItemPosition > -1) {
-                    Map.Entry<String, Pair<String, Integer>> selectedItem =
-                            (Map.Entry<String, Pair<String, Integer>>) allDevices.entrySet().toArray()[selectedItemPosition];
-                    WidgetPreferenceStorage widgetPreferenceStorage = new WidgetPreferenceStorage();
-                    widgetPreferenceStorage.saveWidgetPrefs(getApplicationContext(), String.valueOf(mAppWidgetId), selectedItem.getValue().first);
-                }
-                Intent resultValue = new Intent();
-                resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
-                setResult(RESULT_OK, resultValue);
-                finish();
+            if (selectedItemPosition > -1) {
+                final GBDevice selectedItem = allDevices.get(selectedItemPosition);
+                WidgetPreferenceStorage widgetPreferenceStorage = new WidgetPreferenceStorage();
+                widgetPreferenceStorage.saveWidgetPrefs(getApplicationContext(), String.valueOf(mAppWidgetId), selectedItem.getAddress());
             }
+            Intent resultValueOk = new Intent();
+            resultValueOk.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
+            setResult(RESULT_OK, resultValueOk);
+            finish();
         });
         builder.setCancelable(false);
 
@@ -116,30 +103,6 @@ public class WidgetConfigurationActivity extends Activity implements GBActivity
         dialog.show();
     }
 
-    public LinkedHashMap getAllDevices(Context appContext) {
-        DaoSession daoSession;
-        GBApplication gbApp = (GBApplication) appContext;
-        LinkedHashMap<String, Pair<String, Integer>> newMap = new LinkedHashMap<>(1);
-        List<? extends GBDevice> devices = gbApp.getDeviceManager().getDevices();
-
-        try (DBHandler handler = GBApplication.acquireDB()) {
-            daoSession = handler.getDaoSession();
-            for (GBDevice device : devices) {
-                DeviceCoordinator coordinator = device.getDeviceCoordinator();
-                Device dbDevice = DBHelper.findDevice(device, daoSession);
-                int icon = device.getEnabledDisabledIconResource();
-                if (dbDevice != null && coordinator != null
-                        && (coordinator.supportsActivityDataFetching() || coordinator.supportsActivityTracking())
-                        && !newMap.containsKey(device.getAliasOrName())) {
-                    newMap.put(device.getAliasOrName(), new Pair(device.getAddress(), icon));
-                }
-            }
-        } catch (Exception e) {
-            LOG.error("Error getting list of all devices: " + e);
-        }
-        return newMap;
-    }
-
     @Override
     public void setLanguage(Locale language, boolean invalidateLanguage) {
         AndroidUtils.setLanguage(this, language);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index 4ff6c4e766..b30a14066e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -31,6 +31,8 @@ import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
 import android.content.res.Resources;
 import android.graphics.Color;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.Icon;
 import android.os.Build;
@@ -128,7 +130,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.model.RecordedDataTypes;
 import nodomain.freeyourgadget.gadgetbridge.util.BondingUtil;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.FormatUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
@@ -223,11 +224,14 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
         holder.infoIcons.setVisibility(View.GONE);
         holder.deviceInfoBox.setVisibility(View.GONE);
         holder.cardViewActivityCardLayout.setVisibility(View.GONE);
-        if(countDevicesInFolder(folder.getName(), true) == 0){
-            holder.deviceImageView.setImageResource(R.drawable.ic_device_folder_disabled);
-        }else{
+        holder.deviceImageView.setImageResource(R.drawable.ic_device_folder);
 
-            holder.deviceImageView.setImageResource(R.drawable.ic_device_folder);
+        if (countDevicesInFolder(folder.getName(), true) == 0) {
+            final ColorMatrix colorMatrix = new ColorMatrix();
+            colorMatrix.setSaturation(0);
+            holder.deviceImageView.setColorFilter(new ColorMatrixColorFilter(colorMatrix));
+        } else {
+            holder.deviceImageView.setColorFilter(null);
         }
         holder.deviceInfoView.setVisibility(View.GONE);
         int countInFolder = countDevicesInFolder(folder.getName(), false);
@@ -338,7 +342,15 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
             }
         });
 
-        holder.deviceImageView.setImageResource(device.getEnabledDisabledIconResource());
+        holder.deviceImageView.setImageResource(device.getDeviceCoordinator().getDefaultIconResource());
+        if (device.isInitialized()) {
+            holder.deviceImageView.setColorFilter(null);
+        } else {
+            final ColorMatrix colorMatrix = new ColorMatrix();
+            colorMatrix.setSaturation(0);
+
+            holder.deviceImageView.setColorFilter(new ColorMatrixColorFilter(colorMatrix));
+        }
 
         holder.deviceNameLabel.setText(getUniqueDeviceName(device));
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconAdapter.java
index 5732cdb383..960b865596 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconAdapter.java
@@ -25,40 +25,40 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 
 public class SpinnerWithIconAdapter extends ArrayAdapter<SpinnerWithIconItem> {
-    private static final Logger LOG = LoggerFactory.getLogger(SpinnerWithIconAdapter.class);
-    int groupid;
+    int groupId;
     Activity context;
     ArrayList<SpinnerWithIconItem> list;
     LayoutInflater inflater;
 
-    public SpinnerWithIconAdapter(Activity context, int groupid, int id, ArrayList<SpinnerWithIconItem>
+    public SpinnerWithIconAdapter(Activity context, int groupId, int id, ArrayList<SpinnerWithIconItem>
             list) {
         super(context, id, list);
         this.list = list;
         inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        this.groupid = groupid;
+        this.groupId = groupId;
     }
 
-    public View getView(int position, View convertView, ViewGroup parent) {
-        View itemView = inflater.inflate(groupid, parent, false);
-        ImageView imageView = (ImageView) itemView.findViewById(R.id.spinner_item_icon);
+    @NonNull
+    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
+        if (convertView == null) {
+            convertView = inflater.inflate(groupId, parent, false);
+        }
+        ImageView imageView = convertView.findViewById(R.id.spinner_item_icon);
         imageView.setImageResource(list.get(position).getImageId());
-        TextView textView = (TextView) itemView.findViewById(R.id.spinner_item_text);
+        TextView textView = convertView.findViewById(R.id.spinner_item_text);
         textView.setText(list.get(position).getText());
 
-        return itemView;
+        return convertView;
     }
 
-    public View getDropDownView(int position, View convertView, ViewGroup
-            parent) {
+    public View getDropDownView(int position, View convertView, @NonNull ViewGroup parent) {
         return getView(position, convertView, parent);
 
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index 7e4619834e..9823466fb4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -947,12 +947,6 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         return R.drawable.ic_device_default;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
-
     @Override
     public boolean supportsNotificationVibrationPatterns() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index 8787c4766c..ff41d8ce2a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -831,9 +831,6 @@ public interface DeviceCoordinator {
     @DrawableRes
     int getDefaultIconResource();
 
-    @DrawableRes
-    int getDisabledIconResource();
-
     /**
      * Whether the device supports a variety of vibration patterns for notifications.
      */
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
index d8549514c9..c83ba235e6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
@@ -132,12 +132,7 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
 
     @Override
     public SampleProvider<?> getSampleProvider(GBDevice device, DaoSession session) {
-        return new UnknownSampleProvider();
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
+        return sampleProvider;
     }
 
     @Override
@@ -145,11 +140,6 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
         return "Generic";
     }
 
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
@@ -167,10 +157,4 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_unknown;
     }
-
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_unknown_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/aawireless/AAWirelessCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/aawireless/AAWirelessCoordinator.java
index 968916f712..d8cd6da19f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/aawireless/AAWirelessCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/aawireless/AAWirelessCoordinator.java
@@ -78,11 +78,6 @@ public class AAWirelessCoordinator extends AbstractBLClassicDeviceCoordinator {
         return R.drawable.ic_device_car;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_car_disabled;
-    }
-
     @Override
     public int getBatteryCount(final GBDevice device) {
         return 0;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java
index ef9d210f28..0df030f0de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java
@@ -274,20 +274,13 @@ public class BangleJSCoordinator extends AbstractBLEDeviceCoordinator {
         return BangleJSDeviceSupport.class;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_banglejs;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_banglejs;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_banglejs_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/coordinator/BinarySensorCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/coordinator/BinarySensorCoordinator.java
index 5bf67b4a3b..2b89ac13f4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/coordinator/BinarySensorCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/coordinator/BinarySensorCoordinator.java
@@ -19,12 +19,9 @@ package nodomain.freeyourgadget.gadgetbridge.devices.binary_sensor.coordinator;
 
 import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 import android.os.ParcelUuid;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -32,14 +29,11 @@ import java.util.Collections;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.binary_sensor.activity.DataActivity;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.BinarySensorSupport;
 
@@ -59,7 +53,6 @@ public class BinarySensorCoordinator extends AbstractBLEDeviceCoordinator {
         );
     }
 
-    @NonNull
     @Override
     public boolean supports(GBDeviceCandidate candidate) {
         for(ParcelUuid service : candidate.getServiceUuids()){
@@ -70,57 +63,6 @@ public class BinarySensorCoordinator extends AbstractBLEDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
-        return new int[0];
-    }
-
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return false;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Generic";
@@ -136,21 +78,6 @@ public class BinarySensorCoordinator extends AbstractBLEDeviceCoordinator {
         return DataActivity.class;
     }
 
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public int getBatteryCount(final GBDevice device) {
         return 0;
@@ -167,20 +94,13 @@ public class BinarySensorCoordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_NONE;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_binary_sensor;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_unknown;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_unknown_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchPro2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchPro2Coordinator.java
index a8123c5daa..679d226779 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchPro2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchPro2Coordinator.java
@@ -36,11 +36,6 @@ public class CmfWatchPro2Coordinator extends CmfWatchProCoordinator {
         return R.drawable.ic_device_watchxplus;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_watchxplus_disabled;
-    }
-
     @Override
     public int getBondingStyle() {
         // We can negotiate auth key - #3982
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProCoordinator.java
index 121a43e02c..c586109ffb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProCoordinator.java
@@ -138,11 +138,6 @@ public class CmfWatchProCoordinator extends AbstractBLEDeviceCoordinator {
         return R.drawable.ic_device_amazfit_bip;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/AbstractColmiR0xCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/AbstractColmiR0xCoordinator.java
index 8fa5e3e2d8..d012d7f956 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/AbstractColmiR0xCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/AbstractColmiR0xCoordinator.java
@@ -103,11 +103,6 @@ public abstract class AbstractColmiR0xCoordinator extends AbstractBLEDeviceCoord
         return R.drawable.ic_device_smartring;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_smartring_disabled;
-    }
-
     @Override
     public int getBondingStyle() {
         return BONDING_STYLE_NONE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
index 17ec562655..9ead1bfaa9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
@@ -86,11 +86,6 @@ public class PixooCoordinator extends AbstractBLEDeviceCoordinator {
         return R.drawable.ic_device_lovetoy;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_lovetoy_disabled;
-    }
-
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/domyos/DomyosT540Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/domyos/DomyosT540Coordinator.java
index 26622fd44a..1b1da5853b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/domyos/DomyosT540Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/domyos/DomyosT540Coordinator.java
@@ -16,10 +16,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.domyos;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;
 
 import java.util.EnumSet;
@@ -27,12 +23,9 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.domyos.DomyosT540Support;
@@ -43,76 +36,11 @@ public class DomyosT540Coordinator extends AbstractBLEDeviceCoordinator {
         return Pattern.compile("Domyos-TC-9610.*");
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Domyos";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -134,20 +62,13 @@ public class DomyosT540Coordinator extends AbstractBLEDeviceCoordinator {
         // nothing to delete, yet
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_domyos_t540;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_lovetoy;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_lovetoy_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/earfun/AbstractEarFunCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/earfun/AbstractEarFunCoordinator.java
index 22f7dc890a..654857f2d4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/earfun/AbstractEarFunCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/earfun/AbstractEarFunCoordinator.java
@@ -41,9 +41,4 @@ public abstract class AbstractEarFunCoordinator extends AbstractDeviceCoordinato
     public int getDefaultIconResource() {
         return R.drawable.ic_device_nothingear;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_nothingear_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/evenrealities/G1DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/evenrealities/G1DeviceCoordinator.java
index 70d90f2182..6f52d67c0d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/evenrealities/G1DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/evenrealities/G1DeviceCoordinator.java
@@ -8,9 +8,6 @@ import android.content.SharedPreferences;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -34,7 +31,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.evenrealities.G1Constants;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.evenrealities.G1DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.BondingUtil;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 
 /**
  * Coordinator for the Even Realities G1 smart glasses. Describes the supported capabilities of the
@@ -44,8 +40,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
  */
 public class G1DeviceCoordinator extends AbstractBLEDeviceCoordinator {
 
-    private static final Logger LOG = LoggerFactory.getLogger(G1DeviceCoordinator.class);
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
@@ -81,12 +75,6 @@ public class G1DeviceCoordinator extends AbstractBLEDeviceCoordinator {
         return R.drawable.ic_device_even_realities_g1;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_even_realities_g1_disabled;
-    }
-
     @Override
     public int getBondingStyle() {
         return BONDING_STYLE_LAZY;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java
index cd9526811c..07615ccf64 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java
@@ -16,10 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.femometer;
 
-import android.app.Activity;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
 
@@ -70,12 +67,6 @@ public class FemometerVinca2DeviceCoordinator extends AbstractDeviceCoordinator
         return R.drawable.ic_device_thermometer;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_thermometer_disabled;
-    }
-
-
     @Override
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
         Long deviceId = device.getId();
@@ -83,18 +74,11 @@ public class FemometerVinca2DeviceCoordinator extends AbstractDeviceCoordinator
         qb.where(FemometerVinca2TemperatureSampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
     }
 
-
     @Override
     public int getBondingStyle(){
         return BONDING_STYLE_NONE;
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public int getAlarmSlotCount(final GBDevice device) {
         return 1;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java
index e630ca481e..6de1681323 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java
@@ -43,12 +43,6 @@ public class ColaCao21Coordinator extends FitProDeviceCoordinator {
         return R.drawable.ic_device_amazfit_bip;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_colacao21;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java
index ec502a6c31..74e788653c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java
@@ -43,12 +43,6 @@ public class ColaCao23Coordinator extends FitProDeviceCoordinator {
         return R.drawable.ic_device_amazfit_bip;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_colacao23;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/flipper/zero/FlipperZeroCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/flipper/zero/FlipperZeroCoordinator.java
index 7cb797b00d..45a73068d9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/flipper/zero/FlipperZeroCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/flipper/zero/FlipperZeroCoordinator.java
@@ -16,25 +16,17 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.flipper.zero;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.flipper.zero.support.FlipperZeroSupport;
 
@@ -44,81 +36,19 @@ public class FlipperZeroCoordinator extends AbstractBLEDeviceCoordinator {
 
     }
 
-    @NonNull
     @Override
     public boolean supports(GBDeviceCandidate candidate) {
-        if(candidate.supportsService(UUID.fromString("00003082-0000-1000-8000-00805f9b34fb"))){
-            return true; // need to filter for flipper here
+        if (candidate.supportsService(UUID.fromString("00003082-0000-1000-8000-00805f9b34fb"))){
+            return true; // TODO need to filter for flipper here
         }
         return false;
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
     @Override
     public String getManufacturer() {
         return "Flipper Devices";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return false;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
@@ -130,20 +60,13 @@ public class FlipperZeroCoordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_NONE;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_flipper_zero;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_flipper;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_flipper_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2DeviceCoordinator.java
index a7a3ce9e7b..7ef0c5b703 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2DeviceCoordinator.java
@@ -16,8 +16,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
-import androidx.annotation.NonNull;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -68,9 +66,4 @@ public class GalaxyBuds2DeviceCoordinator extends GalaxyBudsGenericCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds_pro;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_pro_disabled;
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java
index e8f8444bbc..5584767d5b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java
@@ -16,16 +16,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
-import androidx.annotation.NonNull;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 
 public class GalaxyBuds2ProDeviceCoordinator extends GalaxyBudsGenericCoordinator {
     @Override
@@ -69,9 +65,4 @@ public class GalaxyBuds2ProDeviceCoordinator extends GalaxyBudsGenericCoordinato
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds_pro;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_pro_disabled;
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java
index 223e301c3b..e8c46ec346 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java
@@ -17,104 +17,28 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.galaxy_buds.GalaxyBudsDeviceSupport;
 
 public abstract class GalaxyBudsGenericCoordinator extends AbstractBLClassicDeviceCoordinator {
-
     @Override
     public int getBondingStyle() {
         return BONDING_STYLE_BOND;
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice
-                                                                              device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Samsung";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -123,7 +47,6 @@ public abstract class GalaxyBudsGenericCoordinator extends AbstractBLClassicDevi
     @Override
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device
             device, @NonNull DaoSession session) throws GBException {
-
     }
 
     @NonNull
@@ -136,9 +59,4 @@ public abstract class GalaxyBudsGenericCoordinator extends AbstractBLClassicDevi
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java
index 0d3e771c90..ac12f6fabc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java
@@ -64,9 +64,4 @@ public class GalaxyBudsLiveDeviceCoordinator extends GalaxyBudsGenericCoordinato
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds_live;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_live_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java
index fcfbd00dd3..ee5f17f16a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java
@@ -16,16 +16,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
-import androidx.annotation.NonNull;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 
 public class GalaxyBudsProDeviceCoordinator extends GalaxyBudsGenericCoordinator {
     @Override
@@ -69,9 +65,4 @@ public class GalaxyBudsProDeviceCoordinator extends GalaxyBudsGenericCoordinator
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds_pro;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_pro_disabled;
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/GarminWatchCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/GarminWatchCoordinator.java
index a3d9737bc9..a14535dc63 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/GarminWatchCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/GarminWatchCoordinator.java
@@ -10,11 +10,6 @@ public abstract class GarminWatchCoordinator extends GarminCoordinator {
         return R.drawable.ic_device_zetime;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_zetime_disabled;
-    }
-
     @Override
     public boolean supportsCalendarEvents() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/generic_headphones/GenericHeadphonesCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/generic_headphones/GenericHeadphonesCoordinator.java
index f6a5b4bb9b..2dd2e3fd61 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/generic_headphones/GenericHeadphonesCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/generic_headphones/GenericHeadphonesCoordinator.java
@@ -80,11 +80,6 @@ public class GenericHeadphonesCoordinator extends AbstractDeviceCoordinator {
         return R.drawable.ic_device_headphones;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_headphones_disabled;
-    }
-
     @Override
     public DeviceSpecificSettings getDeviceSpecificSettings(final GBDevice device) {
         final DeviceSpecificSettings deviceSpecificSettings = new DeviceSpecificSettings();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/gree/GreeAcCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/gree/GreeAcCoordinator.java
index 55d37cb64f..297d5a3a47 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/gree/GreeAcCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/gree/GreeAcCoordinator.java
@@ -53,11 +53,6 @@ public class GreeAcCoordinator extends AbstractBLEDeviceCoordinator {
         return R.drawable.ic_device_air_conditioning;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_air_conditioning_disabled;
-    }
-
     @Override
     public boolean suggestUnbindBeforePair() {
         // shouldn't matter
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java
index 7e5c14b167..08d0185f88 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java
@@ -263,9 +263,4 @@ public class HPlusCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_hplus;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_hplus_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
index beb5e1d4d6..9e6ce8f057 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
@@ -638,9 +638,4 @@ public abstract class HuamiCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_zetime;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_zetime_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
index a8edd2543a..2eb20ad9fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
@@ -180,9 +180,4 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband2;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband2_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
index ec2dd6bec0..8099f8c060 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
@@ -134,9 +134,4 @@ public class AmazfitBipCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3/AmazfitBip3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3/AmazfitBip3Coordinator.java
index f015a438fd..ced5709125 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3/AmazfitBip3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3/AmazfitBip3Coordinator.java
@@ -186,9 +186,4 @@ public class AmazfitBip3Coordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java
index 4a5aacaa1f..766b95f39b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java
@@ -183,9 +183,4 @@ public class AmazfitBip3ProCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
index fb66e4ee2e..e4bc65178c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
@@ -155,9 +155,4 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
index 886e52f6ef..2915851678 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
@@ -184,9 +184,4 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
index 0bb16a6c8b..76d44c549e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
@@ -175,9 +175,4 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
index 8225072897..da0af3c70d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
@@ -144,9 +144,4 @@ public class AmazfitCorCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_default;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
index ebafb2c732..ad3a1b31e8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
@@ -144,9 +144,4 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_default;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
index 1cea7c15b6..63b6572fd4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
@@ -145,9 +145,4 @@ public class AmazfitGTSCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
index 2cc0a99773..908b10539c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
@@ -150,9 +150,4 @@ public class AmazfitGTS2Coordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
index 61931f518b..c599bbb9d9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
@@ -150,9 +150,4 @@ public class AmazfitGTS2eCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
index 0f91f77e41..1fea68e643 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
@@ -145,9 +145,4 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopCoordinator.java
index 0b7d9b9854..6e00670fe9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopCoordinator.java
@@ -47,16 +47,6 @@ public class AmazfitPopCoordinator extends AmazfitBipUCoordinator {
         return R.string.devicetype_amazfit_pop;
     }
 
-    @Override
-    public int getDefaultIconResource() {
-        return R.drawable.ic_device_amazfit_bip;
-    }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
index d9e11a468d..7eff651944 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
@@ -126,9 +126,4 @@ public class AmazfitVergeLCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
index 456d5fa9c0..7e03fc7914 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
@@ -143,9 +143,4 @@ public class AmazfitXCoordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband2;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband2_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
index 9195674133..ea68eb7f4f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
@@ -133,9 +133,4 @@ public class MiBand2Coordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband2;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband2_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
index af5ae604b8..2d215b5b03 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
@@ -119,11 +119,6 @@ public class MiBand2HRXCoordinator extends HuamiCoordinator {
         return R.drawable.ic_device_miband2;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband2_disabled;
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_miband2_hrx;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
index e57bd76bed..7d7683447f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
@@ -167,9 +167,4 @@ public class MiBand3Coordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband2;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband2_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
index 21c4cd4f56..82368f3279 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
@@ -177,9 +177,4 @@ public class MiBand4Coordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband2;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband2_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
index 6cd290f0f3..2b80f6cac6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
@@ -196,9 +196,4 @@ public class MiBand5Coordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband2;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband2_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
index c9e085c468..6fcacaf629 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
@@ -218,9 +218,4 @@ public class MiBand6Coordinator extends HuamiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband6;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband6_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBand7Coordinator.java
index 717758056d..ccdb074587 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBand7Coordinator.java
@@ -60,9 +60,4 @@ public class AmazfitBand7Coordinator extends ZeppOsCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_default;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip5Coordinator.java
index f4797e2d59..9f8f6bf465 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip5Coordinator.java
@@ -68,9 +68,4 @@ public class AmazfitBip5Coordinator extends ZeppOsCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip5UnityCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip5UnityCoordinator.java
index 2416c5558b..ece4d5a779 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip5UnityCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip5UnityCoordinator.java
@@ -64,9 +64,4 @@ public class AmazfitBip5UnityCoordinator extends ZeppOsCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip6Coordinator.java
index 3346992857..4f679fd6b0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitBip6Coordinator.java
@@ -69,9 +69,4 @@ public class AmazfitBip6Coordinator extends ZeppOsCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitCheetahSquareCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitCheetahSquareCoordinator.java
index 5e3d3da7b1..ee693fabf2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitCheetahSquareCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitCheetahSquareCoordinator.java
@@ -82,9 +82,4 @@ public class AmazfitCheetahSquareCoordinator extends ZeppOsCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS3Coordinator.java
index 15dea47f1f..c1a46d3644 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS3Coordinator.java
@@ -58,9 +58,4 @@ public class AmazfitGTS3Coordinator extends ZeppOsCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS4Coordinator.java
index 4256732ccb..44e83be8fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS4Coordinator.java
@@ -78,9 +78,4 @@ public class AmazfitGTS4Coordinator extends ZeppOsCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS4MiniCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS4MiniCoordinator.java
index 8ed0808270..560488765b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS4MiniCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/AmazfitGTS4MiniCoordinator.java
@@ -58,9 +58,4 @@ public class AmazfitGTS4MiniCoordinator extends ZeppOsCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/MiBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/MiBand7Coordinator.java
index ac26c4a659..38ea2e6497 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/MiBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/watches/MiBand7Coordinator.java
@@ -79,9 +79,4 @@ public class MiBand7Coordinator extends ZeppOsCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband6;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband6_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiFreebudsCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiFreebudsCoordinator.java
index a75ecbb851..a9571da79e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiFreebudsCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiFreebudsCoordinator.java
@@ -60,11 +60,6 @@ public abstract class HuaweiFreebudsCoordinator extends AbstractBLClassicDeviceC
         return R.drawable.ic_device_nothingear;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_nothingear_disabled;
-    }
-
     @Override
     public HuaweiCoordinator getHuaweiCoordinator() {
         return huaweiCoordinator;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java
index c0f2ef272f..336b6731c5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java
@@ -17,21 +17,17 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.id115;
 
-import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 import android.os.ParcelUuid;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
@@ -54,13 +50,9 @@ public class ID115Coordinator extends AbstractBLEDeviceCoordinator {
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
     }
 
-    @NonNull
     @Override
     public boolean supports(GBDeviceCandidate candidate) {
-        if (candidate.supportsService(ID115Constants.UUID_SERVICE_ID115)) {
-            return true;
-        }
-        return false;
+        return candidate.supportsService(ID115Constants.UUID_SERVICE_ID115);
     }
 
     @Override
@@ -68,12 +60,6 @@ public class ID115Coordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_NONE;
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public boolean supportsActivityDataFetching() {
         return true;
@@ -89,61 +75,11 @@ public class ID115Coordinator extends AbstractBLEDeviceCoordinator {
         return new ID115SampleProvider(device, session);
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "VeryFit";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return false;
-    }
-
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
@@ -170,9 +106,4 @@ public class ID115Coordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_h30_h10;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_h30_h10_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagCoordinator.java
index d134394159..acdc0a301b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagCoordinator.java
@@ -17,10 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.itag;
 
-import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 
 import androidx.annotation.NonNull;
 
@@ -30,12 +27,9 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.itag.ITagSupport;
 
@@ -65,76 +59,16 @@ public class ITagCoordinator extends AbstractBLEDeviceCoordinator {
         return Collections.singletonList(filter);
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Unspecified"; //TODO: Show chip manufacturer?
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
     @Override
     public boolean supportsRealtimeData() {
         return false; //TODO: RRSI
     }
 
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -151,20 +85,13 @@ public class ITagCoordinator extends AbstractBLEDeviceCoordinator {
         // nothing to delete, yet
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_itag;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_itag;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_itag_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16DeviceCoordinator.java
index 9f4d9882ba..7bda5533a4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16DeviceCoordinator.java
@@ -18,36 +18,25 @@
 
 package nodomain.freeyourgadget.gadgetbridge.devices.jyou;
 
-import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 import android.os.ParcelUuid;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.regex.Pattern;
 
 import androidx.annotation.NonNull;
+
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.jyou.BFH16DeviceSupport;
 
-public class BFH16DeviceCoordinator extends AbstractBLEDeviceCoordinator
-{
-    protected static final Logger LOG = LoggerFactory.getLogger(BFH16DeviceCoordinator.class);
-
+public class BFH16DeviceCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     public String getManufacturer() {
         return "Denver";
@@ -56,7 +45,6 @@ public class BFH16DeviceCoordinator extends AbstractBLEDeviceCoordinator
     @NonNull
     @Override
     public Collection<? extends ScanFilter> createBLEScanFilters() {
-
         ParcelUuid bfhService1 = new ParcelUuid(BFH16Constants.BFH16_IDENTIFICATION_SERVICE1);
         ParcelUuid bfhService2 = new ParcelUuid(BFH16Constants.BFH16_IDENTIFICATION_SERVICE2);
 
@@ -74,125 +62,41 @@ public class BFH16DeviceCoordinator extends AbstractBLEDeviceCoordinator
     }
 
     @Override
-    public int getBondingStyle(){
+    public int getBondingStyle() {
         return BONDING_STYLE_NONE;
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity(){
-        return null;
-    }
-
-    //Additional required functions ______________________________________
-
     @Override
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
 
     }
 
     @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity()
-    {
-        return null;
-    }
-
-
-    //Supported ________________________________________________________
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device)
-    {
+    public int getAlarmSlotCount(GBDevice device) {
         return 3;
     }
 
     @Override
-    public boolean supportsFindDevice()
-    {
+    public boolean supportsFindDevice() {
         return true;
     }
 
     @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device)
-    {
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
         return true;
     }
 
     @Override
-    public boolean supportsRealtimeData()
-    {
+    public boolean supportsRealtimeData() {
         return true;
     }
 
-
-    //NOT Supported ________________________________________________________
-
-    @Override
-    public boolean supportsActivityDataFetching(){
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean supportsLedColor()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean supportsMusicInfo()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRgbLedColor()
-    {
-        return false;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
         return BFH16DeviceSupport.class;
     }
 
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather()
-    {
-        return false;
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_bfh16;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java
index efcea4cb40..00560ce048 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java
@@ -17,15 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.jyou.TeclastH30;
 
-import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 import android.os.ParcelUuid;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.regex.Pattern;
@@ -34,21 +28,15 @@ import androidx.annotation.NonNull;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.jyou.JYouConstants;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.jyou.TeclastH30.TeclastH30Support;
 
 public class TeclastH30Coordinator extends AbstractBLEDeviceCoordinator {
-
-    protected static final Logger LOG = LoggerFactory.getLogger(TeclastH30Coordinator.class);
-
     @NonNull
     @Override
     public Collection<? extends ScanFilter> createBLEScanFilters() {
@@ -57,7 +45,6 @@ public class TeclastH30Coordinator extends AbstractBLEDeviceCoordinator {
         return Collections.singletonList(filter);
     }
 
-    @NonNull
     @Override
     public boolean supports(GBDeviceCandidate candidate) {
         if (candidate.supportsService(JYouConstants.UUID_SERVICE_JYOU)) {
@@ -77,21 +64,11 @@ public class TeclastH30Coordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_NONE;
     }
 
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
     @Override
     public boolean supportsRealtimeData() {
         return true;
     }
 
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -103,36 +80,6 @@ public class TeclastH30Coordinator extends AbstractBLEDeviceCoordinator {
         return TeclastH30Support.class;
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount(GBDevice device) {
         return 3;
@@ -148,35 +95,18 @@ public class TeclastH30Coordinator extends AbstractBLEDeviceCoordinator {
         return "Teclast";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
     @Override
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
 
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_teclast_h30;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_h30_h10;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_h30_h10_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/y5/Y5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/y5/Y5Coordinator.java
index 0935790761..ec98d92f7e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/y5/Y5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/y5/Y5Coordinator.java
@@ -17,11 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.jyou.y5;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
 
@@ -29,7 +25,6 @@ import de.greenrobot.dao.query.QueryBuilder;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.jyou.JYouSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
@@ -53,12 +48,6 @@ public class Y5Coordinator extends AbstractBLEDeviceCoordinator {
         return Pattern.compile(".*Y5.*");
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public boolean supportsActivityDataFetching() {
         return true;
@@ -74,16 +63,6 @@ public class Y5Coordinator extends AbstractBLEDeviceCoordinator {
         return new JYouSampleProvider(device, session);
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount(GBDevice device) {
         return 3;
@@ -104,31 +83,11 @@ public class Y5Coordinator extends AbstractBLEDeviceCoordinator {
         return "Y5";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
     @Override
     public boolean supportsRealtimeData() {
         return true;
     }
 
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -140,20 +99,13 @@ public class Y5Coordinator extends AbstractBLEDeviceCoordinator {
         return Y5Support.class;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_y5;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_h30_h10;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_h30_h10_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/BohemicSmartBraceletDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/BohemicSmartBraceletDeviceCoordinator.java
index e624c15d5c..e895b1100e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/BohemicSmartBraceletDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/BohemicSmartBraceletDeviceCoordinator.java
@@ -50,15 +50,4 @@ public class BohemicSmartBraceletDeviceCoordinator extends LefunDeviceCoordinato
     public int getDeviceNameResource() {
         return R.string.devicetype_bohemic_smart_bracelet;
     }
-
-
-    @Override
-    public int getDefaultIconResource() {
-        return R.drawable.ic_device_h30_h10;
-    }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_h30_h10_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunDeviceCoordinator.java
index 1c7c6556d5..1941bfd0f0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunDeviceCoordinator.java
@@ -157,9 +157,4 @@ public class LefunDeviceCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_h30_h10;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_h30_h10_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/VivitarHrBpMonitorActivityTrackerCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/VivitarHrBpMonitorActivityTrackerCoordinator.java
index 677e8ce66d..20cb79b0b5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/VivitarHrBpMonitorActivityTrackerCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/VivitarHrBpMonitorActivityTrackerCoordinator.java
@@ -49,14 +49,4 @@ public class VivitarHrBpMonitorActivityTrackerCoordinator extends LefunDeviceCoo
     public int getDeviceNameResource() {
         return R.string.devicetype_vivitar_hr_bp_monitor_activity_tracker;
     }
-
-    @Override
-    public int getDefaultIconResource() {
-        return R.drawable.ic_device_h30_h10;
-    }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_h30_h10_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java
index ec3e195f0f..f960099091 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java
@@ -17,6 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lenovo.watchxplus;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
 import android.content.SharedPreferences;
@@ -79,6 +80,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_NONE;
     }
 
+    /** @noinspection RedundantIfStatement*/
     @Override
     public boolean supports(GBDeviceCandidate candidate) {
         String macAddress = candidate.getMacAddress().toUpperCase();
@@ -190,23 +192,24 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
                 int iDuration;
 
                 try {
-                    iDuration = Integer.valueOf(duration);
+                    iDuration = Integer.parseInt(duration);
                 } catch (Exception ex) {
                     iDuration = 60;
                 }
 
                 return iDuration;
             } catch (Exception e) {
+                LOG.error("Failed to parse find phone time", e);
                 return FindPhone_ON;
             }
         }
     }
 
-
     /**
      * @param startOut out Only hour/minute are used.
      * @param endOut   out Only hour/minute are used.
      * @return True if DND hours are enabled.
+     * @noinspection DataFlowIssue
      */
     public static boolean getDNDHours(String deviceAddress, Calendar startOut, Calendar endOut) {
         SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress);
@@ -220,7 +223,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
             String start = prefs.getString(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_NOAUTO_START, "01:00");
             String end = prefs.getString(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_NOAUTO_END, "06:00");
 
-            DateFormat df = new SimpleDateFormat("HH:mm");
+            @SuppressLint("SimpleDateFormat") DateFormat df = new SimpleDateFormat("HH:mm");
 
             try {
                 startOut.setTime(df.parse(start));
@@ -228,6 +231,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
 
                 return true;
             } catch (Exception e) {
+                LOG.error("Failed to parse dnd hours", e);
                 return false;
             }
         }
@@ -237,6 +241,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
      * @param startOut out Only hour/minute are used.
      * @param endOut   out Only hour/minute are used.
      * @return True if DND hours are enabled.
+     * @noinspection DataFlowIssue
      */
     public static boolean getLongSitHours(String deviceAddress, Calendar startOut, Calendar endOut) {
         SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress);
@@ -249,7 +254,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
             String start = prefs.getString(DeviceSettingsPreferenceConst.PREF_INACTIVITY_START, "06:00");
             String end = prefs.getString(DeviceSettingsPreferenceConst.PREF_INACTIVITY_END, "23:00");
 
-            DateFormat df = new SimpleDateFormat("HH:mm");
+            @SuppressLint("SimpleDateFormat") DateFormat df = new SimpleDateFormat("HH:mm");
 
             try {
                 startOut.setTime(df.parse(start));
@@ -257,6 +262,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
 
                 return true;
             } catch (Exception e) {
+                LOG.error("Failed to parse long sit hours", e);
                 return false;
             }
         }
@@ -277,9 +283,4 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_watchxplus;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_watchxplus_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java
index 8b1a66c1f6..784c0e7ee5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java
@@ -17,10 +17,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.liveview;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;
 
 import java.util.regex.Pattern;
@@ -28,12 +24,9 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.liveview.LiveviewSupport;
 
@@ -43,76 +36,11 @@ public class LiveviewCoordinator extends AbstractBLClassicDeviceCoordinator {
         return Pattern.compile("LiveView.*");
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Sony Ericsson";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java
index e6ef98ca2a..fded246aa0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java
@@ -22,13 +22,9 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.regex.Pattern;
 
-import android.app.Activity;
-import android.content.Context;
 import android.content.SharedPreferences;
-import android.net.Uri;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +34,6 @@ import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
@@ -95,7 +90,7 @@ public class MakibesHR3Coordinator extends AbstractBLEDeviceCoordinator {
 
                 return true;
             } catch (Exception e) {
-                LOG.error("Unexpected exception in MiBand2Coordinator.getTime: " + e.getMessage());
+                LOG.error("Failed to parse time", e);
                 return false;
             }
         }
@@ -118,7 +113,7 @@ public class MakibesHR3Coordinator extends AbstractBLEDeviceCoordinator {
                 int iDuration;
 
                 try {
-                    iDuration = Integer.valueOf(duration);
+                    iDuration = Integer.parseInt(duration);
                 } catch (Exception ex) {
                     LOG.warn(ex.getMessage());
                     iDuration = 60;
@@ -126,7 +121,7 @@ public class MakibesHR3Coordinator extends AbstractBLEDeviceCoordinator {
 
                 return iDuration;
             } catch (Exception e) {
-                LOG.error("Unexpected exception in MiBand2Coordinator.getTime: " + e.getMessage());
+                LOG.error("Failed to parse duration", e);
                 return FindPhone_ON;
             }
         }
@@ -149,37 +144,16 @@ public class MakibesHR3Coordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_BOND;
     }
 
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
     @Override
     public boolean supportsRealtimeData() {
         return true;
     }
 
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
     @Override
     public boolean supportsActivityTracking() {
         return true;
@@ -190,16 +164,6 @@ public class MakibesHR3Coordinator extends AbstractBLEDeviceCoordinator {
         return new MakibesHR3SampleProvider(device, session);
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount(GBDevice device) {
         return 8;
@@ -215,16 +179,6 @@ public class MakibesHR3Coordinator extends AbstractBLEDeviceCoordinator {
         return "Makibes";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/marstek/MarstekB2500DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/marstek/MarstekB2500DeviceCoordinator.java
index eb76cd83e2..02550cc5af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/marstek/MarstekB2500DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/marstek/MarstekB2500DeviceCoordinator.java
@@ -44,11 +44,6 @@ public class MarstekB2500DeviceCoordinator extends AbstractDeviceCoordinator {
         return R.drawable.ic_device_vesc;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_vesc_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Marstek";
@@ -98,5 +93,4 @@ public class MarstekB2500DeviceCoordinator extends AbstractDeviceCoordinator {
     public boolean isExperimental() {
         return true;
     }
-
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
index 072c6bdce2..19cadfaf19 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
@@ -160,10 +160,11 @@ public class MiBandCoordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
+    /** @noinspection BooleanMethodIsAlwaysInverted*/
     public static boolean hasValidUserInfo() {
         String dummyMacAddress = MiBandService.MAC_ADDRESS_FILTER_1_1A + ":00:00:00";
         try {
-            UserInfo userInfo = getConfiguredUserInfo(dummyMacAddress);
+            getConfiguredUserInfo(dummyMacAddress);
             return true;
         } catch (IllegalArgumentException ex) {
             return false;
@@ -174,13 +175,12 @@ public class MiBandCoordinator extends AbstractBLEDeviceCoordinator {
      * Returns the configured user info, or, if that is not available or invalid,
      * a default user info.
      *
-     * @param miBandAddress
      */
     public static UserInfo getAnyUserInfo(String miBandAddress) {
         try {
             return getConfiguredUserInfo(miBandAddress);
         } catch (Exception ex) {
-            LOG.error("Error creating user info from settings, using default user instead: " + ex);
+            LOG.error("Error creating user info from settings, using default user instead", ex);
             return UserInfo.getDefault(miBandAddress);
         }
     }
@@ -188,14 +188,13 @@ public class MiBandCoordinator extends AbstractBLEDeviceCoordinator {
     /**
      * Returns the user info from the user configured data in the preferences.
      *
-     * @param miBandAddress
      * @throws IllegalArgumentException when the user info can not be created
      */
     public static UserInfo getConfiguredUserInfo(String miBandAddress) throws IllegalArgumentException {
         ActivityUser activityUser = new ActivityUser();
         Prefs prefs = GBApplication.getPrefs();
 
-        UserInfo info = UserInfo.create(
+        return UserInfo.create(
                 miBandAddress,
                 prefs.getString(PREF_USER_NAME, null),
                 activityUser.getGender(),
@@ -204,7 +203,6 @@ public class MiBandCoordinator extends AbstractBLEDeviceCoordinator {
                 activityUser.getWeightKg(),
                 0
         );
-        return info;
     }
 
     public static int getWearLocation(String deviceAddress) throws IllegalArgumentException {
@@ -300,10 +298,4 @@ public class MiBandCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband;
     }
-
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
index 4e5ead2717..1a3bfe612e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
@@ -36,11 +36,6 @@ public class MijiaLywsd02Coordinator extends AbstractMijiaLywsdCoordinator {
         return R.drawable.ic_device_pebble;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_pebble_disabled;
-    }
-
     @Override
     public boolean supportsSetTime() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java
index 8bcbb156b7..8204a5aa68 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java
@@ -36,11 +36,6 @@ public class MijiaLywsd03Coordinator extends AbstractMijiaLywsdCoordinator {
         return R.drawable.ic_device_thermometer;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_thermometer_disabled;
-    }
-
     @Override
     public boolean supportsSetTime() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaMhoC303Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaMhoC303Coordinator.java
index faa99669c8..c0a459ea19 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaMhoC303Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaMhoC303Coordinator.java
@@ -36,11 +36,6 @@ public class MijiaMhoC303Coordinator extends AbstractMijiaLywsdCoordinator {
         return R.drawable.ic_device_pebble;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_pebble_disabled;
-    }
-
     @Override
     public boolean supportsSetTime() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaXmwsdj04Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaXmwsdj04Coordinator.java
index 7a87e2f5f7..dd03b61227 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaXmwsdj04Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaXmwsdj04Coordinator.java
@@ -36,11 +36,6 @@ public class MijiaXmwsdj04Coordinator extends AbstractMijiaLywsdCoordinator {
         return R.drawable.ic_device_thermometer;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_thermometer_disabled;
-    }
-
     @Override
     public boolean supportsSetTime() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiCompositionScaleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiCompositionScaleCoordinator.java
index 76e5bc3963..06e669e212 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiCompositionScaleCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiCompositionScaleCoordinator.java
@@ -75,7 +75,7 @@ public class MiCompositionScaleCoordinator extends AbstractBLEDeviceCoordinator
 
     @Override
     public int getBondingStyle() {
-        return super.BONDING_STYLE_NONE;
+        return BONDING_STYLE_NONE;
     }
 
     @Override
@@ -134,9 +134,4 @@ public class MiCompositionScaleCoordinator extends AbstractBLEDeviceCoordinator
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miscale;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miscale_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiSmartScaleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiSmartScaleCoordinator.java
index de71343420..968beed81b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiSmartScaleCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiSmartScaleCoordinator.java
@@ -58,11 +58,6 @@ public class MiSmartScaleCoordinator extends AbstractBLEDeviceCoordinator {
         return R.drawable.ic_device_miscale;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miscale_disabled;
-    }
-
     @Override
     public int getBatteryCount(final GBDevice device) {
         return 0;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moondrop/MoondropSpaceTravelCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moondrop/MoondropSpaceTravelCoordinator.java
index c923b45170..4ea04de945 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moondrop/MoondropSpaceTravelCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moondrop/MoondropSpaceTravelCoordinator.java
@@ -52,11 +52,6 @@ public class MoondropSpaceTravelCoordinator extends AbstractBLClassicDeviceCoord
         return R.drawable.ic_device_nothingear;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_nothingear_disabled;
-    }
-
     @Override
     public boolean supportsOSBatteryLevel() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/AdvanWatchSE1AICoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/AdvanWatchSE1AICoordinator.java
index a771704146..946e951dac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/AdvanWatchSE1AICoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/AdvanWatchSE1AICoordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -43,12 +40,6 @@ public class AdvanWatchSE1AICoordinator extends AbstractMoyoungDeviceCoordinator
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Advan";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/C20Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/C20Coordinator.java
index 99bb1b2e1a..f6430820b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/C20Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/C20Coordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -42,12 +39,6 @@ public class C20Coordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_banglejs;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_banglejs_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Unspecified";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiI28UltraCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiI28UltraCoordinator.java
index 0e4a7f691e..be686e6de7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiI28UltraCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiI28UltraCoordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -43,12 +40,6 @@ public class ColmiI28UltraCoordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Colmi";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiV72Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiV72Coordinator.java
index 71ed472963..e0379184fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiV72Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiV72Coordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -43,12 +40,6 @@ public class ColmiV72Coordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Colmi";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiV89Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiV89Coordinator.java
index 7f71f54249..8feef5f67c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiV89Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ColmiV89Coordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -43,12 +40,6 @@ public class ColmiV89Coordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Colmi";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/FireBolttTalkCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/FireBolttTalkCoordinator.java
index 9dc6b33ee8..3ad2ec49e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/FireBolttTalkCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/FireBolttTalkCoordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -43,12 +40,6 @@ public class FireBolttTalkCoordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Fire-Boltt";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/KT80Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/KT80Coordinator.java
index 552d0b2eed..28e9c6d8e8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/KT80Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/KT80Coordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -42,12 +39,6 @@ public class KT80Coordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_banglejs;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_banglejs_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Unspecified";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/KsixVentureCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/KsixVentureCoordinator.java
index 39a9e8632d..082aebb33d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/KsixVentureCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/KsixVentureCoordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -43,12 +40,6 @@ public class KsixVentureCoordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "KSIX";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/MisirunC17Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/MisirunC17Coordinator.java
index c489498247..5fc181a67f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/MisirunC17Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/MisirunC17Coordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -43,12 +40,6 @@ public class MisirunC17Coordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_banglejs;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_banglejs_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Misirun";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/R50ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/R50ProCoordinator.java
index ce3dcaf6e2..7b832ce5f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/R50ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/R50ProCoordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -42,12 +39,6 @@ public class R50ProCoordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_banglejs;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_banglejs_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Unspecified";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/RainbuvvyT97Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/RainbuvvyT97Coordinator.java
index 59987be2fd..3c718b4d6a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/RainbuvvyT97Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/RainbuvvyT97Coordinator.java
@@ -18,9 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.moyoung;
 
 import androidx.annotation.DrawableRes;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -43,12 +40,6 @@ public class RainbuvvyT97Coordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Rainbuvvy";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ViranC29Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ViranC29Coordinator.java
index f9ada32214..6efe1897ef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ViranC29Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/ViranC29Coordinator.java
@@ -43,12 +43,6 @@ public class ViranC29Coordinator extends AbstractMoyoungDeviceCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Viran";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java
index 6732042aa7..6351ad5282 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java
@@ -18,10 +18,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.no1f1;
 
-import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 import android.os.ParcelUuid;
 
 import java.util.Collection;
@@ -29,12 +26,11 @@ import java.util.Collections;
 import java.util.regex.Pattern;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+
 import de.greenrobot.dao.query.QueryBuilder;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
@@ -63,12 +59,6 @@ public class No1F1Coordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_NONE;
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public boolean supportsActivityDataFetching() {
         return true;
@@ -84,16 +74,6 @@ public class No1F1Coordinator extends AbstractBLEDeviceCoordinator {
         return new No1F1SampleProvider(device, session);
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount(GBDevice device) {
         return 3;
@@ -109,31 +89,6 @@ public class No1F1Coordinator extends AbstractBLEDeviceCoordinator {
         return "NO1";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -163,9 +118,4 @@ public class No1F1Coordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_hplus;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_hplus_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java
index 0db85022d5..16838564d1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java
@@ -87,11 +87,6 @@ public abstract class AbstractEarCoordinator extends AbstractBLClassicDeviceCoor
         return R.drawable.ic_device_nothingear;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_nothingear_disabled;
-    }
-
     @Override
     public DeviceSpecificSettingsCustomizer getDeviceSpecificSettingsCustomizer(final GBDevice device) {
         return new EarSettingsCustomizer();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutCoordinator.java
index 02d787dda5..3987a202dc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutCoordinator.java
@@ -19,8 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.nut;
 
 import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 
 import androidx.annotation.NonNull;
 
@@ -30,12 +28,9 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.nut.NutSupport;
 
@@ -45,11 +40,6 @@ public class NutCoordinator extends AbstractBLEDeviceCoordinator {
         return Pattern.compile("nut.*", Pattern.CASE_INSENSITIVE);
     }
 
-    @Override
-    public int getBondingStyle() {
-        return BONDING_STYLE_ASK;
-    }
-
     @NonNull
     @Override
     public Collection<? extends ScanFilter> createBLEScanFilters() {
@@ -72,76 +62,21 @@ public class NutCoordinator extends AbstractBLEDeviceCoordinator {
         return NutSupport.class;
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Nut";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public Class<? extends Activity> getAppsManagementActivity() {
         return null;
     }
 
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
     @Override
     public boolean supportsRealtimeData() {
         return false; //TODO: RRSI
     }
 
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -151,20 +86,13 @@ public class NutCoordinator extends AbstractBLEDeviceCoordinator {
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) {
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_nut_mini;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_itag;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_itag_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/onemoresonoflow/OneMoreSonoFlowCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/onemoresonoflow/OneMoreSonoFlowCoordinator.java
index e23ad2c4d5..0f62258098 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/onemoresonoflow/OneMoreSonoFlowCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/onemoresonoflow/OneMoreSonoFlowCoordinator.java
@@ -88,9 +88,4 @@ public class OneMoreSonoFlowCoordinator extends AbstractDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_headphones;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_headphones_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/oppo/OppoHeadphonesCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/oppo/OppoHeadphonesCoordinator.java
index 0614c8ef5b..2acedd2fe9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/oppo/OppoHeadphonesCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/oppo/OppoHeadphonesCoordinator.java
@@ -61,11 +61,6 @@ public abstract class OppoHeadphonesCoordinator extends AbstractBLClassicDeviceC
         return R.drawable.ic_device_nothingear;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_nothingear_disabled;
-    }
-
     @Override
     public int getBatteryCount(final GBDevice device) {
         return 3;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
index b09b905cff..ed347ef7fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
@@ -90,16 +90,13 @@ public class PebbleCoordinator extends AbstractBLClassicDeviceCoordinator {
     public SampleProvider<? extends AbstractActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
         DevicePrefs prefs = GBApplication.getDevicePrefs(device);
         int activityTracker = prefs.getInt("pebble_activitytracker", SampleProvider.PROVIDER_PEBBLE_HEALTH);
-        switch (activityTracker) {
-            case SampleProvider.PROVIDER_PEBBLE_HEALTH:
-                return new PebbleHealthSampleProvider(device, session);
-            case SampleProvider.PROVIDER_PEBBLE_MISFIT:
-                return new PebbleMisfitSampleProvider(device, session);
-            case SampleProvider.PROVIDER_PEBBLE_MORPHEUZ:
-                return new PebbleMorpheuzSampleProvider(device, session);
-            default:
-                return new PebbleHealthSampleProvider(device, session);
-        }
+        return switch (activityTracker) {
+            case SampleProvider.PROVIDER_PEBBLE_MISFIT ->
+                    new PebbleMisfitSampleProvider(device, session);
+            case SampleProvider.PROVIDER_PEBBLE_MORPHEUZ ->
+                    new PebbleMorpheuzSampleProvider(device, session);
+            default -> new PebbleHealthSampleProvider(device, session);
+        };
     }
 
     @Override
@@ -111,11 +108,6 @@ public class PebbleCoordinator extends AbstractBLClassicDeviceCoordinator {
     @Override
     public boolean supportsFlashing() { return true; }
 
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
     @Override
     public boolean supportsActivityTracking() {
         return true;
@@ -126,11 +118,6 @@ public class PebbleCoordinator extends AbstractBLClassicDeviceCoordinator {
         return true;
     }
 
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
     @Override
     public int getCannedRepliesSlotCount(final GBDevice device) {
         return 16;
@@ -203,11 +190,6 @@ public class PebbleCoordinator extends AbstractBLClassicDeviceCoordinator {
         return true;
     }
 
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
     @Override
     public boolean supportsWeather() {
         return true;
@@ -277,12 +259,6 @@ public class PebbleCoordinator extends AbstractBLClassicDeviceCoordinator {
         return R.drawable.ic_device_pebble;
     }
 
-    @Override
-    @DrawableRes
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_pebble_disabled;
-    }
-
     public boolean isBackgroundJsEnabled(final GBDevice device) {
         DevicePrefs deviceSpecificPreferences = GBApplication.getDevicePrefs(device);
         return deviceSpecificPreferences.getBoolean(BG_JS_ENABLED, BG_JS_ENABLED_DEFAULT);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java
index 5700db2d7e..c5a7c4cd87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java
@@ -18,7 +18,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pinetime;
 
-import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 
@@ -43,11 +42,6 @@ public class PineTimeJFCoordinator extends AbstractBLEDeviceCoordinator {
         return Pattern.compile("Pinetime-JF.*|InfiniTime.*");
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public InstallHandler findInstallHandler(Uri uri, Context context) {
         PineTimeInstallHandler handler = new PineTimeInstallHandler(uri, context);
@@ -57,11 +51,6 @@ public class PineTimeJFCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     public boolean supportsFlashing() { return true; }
 
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
     @Override
     public boolean supportsActivityTracking() {
         return true;
@@ -72,16 +61,6 @@ public class PineTimeJFCoordinator extends AbstractBLEDeviceCoordinator {
         return new PineTimeActivitySampleProvider(device, session);
     }
 
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
     @Override
     public boolean supportsHeartRateMeasurement(GBDevice device) {
         return true;
@@ -97,26 +76,6 @@ public class PineTimeJFCoordinator extends AbstractBLEDeviceCoordinator {
         return "Pine64";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
     @Override
     public boolean supportsWeather() {
         return true;
@@ -178,9 +137,4 @@ public class PineTimeJFCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_pinetime;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_pinetime_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pixel/PixelBudsACoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pixel/PixelBudsACoordinator.java
index a7e7bed225..253f12a52a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pixel/PixelBudsACoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pixel/PixelBudsACoordinator.java
@@ -25,11 +25,6 @@ public class PixelBudsACoordinator extends AbstractDeviceCoordinator {
         return R.drawable.ic_device_galaxy_buds_pro;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_pro_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Google";
@@ -40,11 +35,6 @@ public class PixelBudsACoordinator extends AbstractDeviceCoordinator {
         return Pattern.compile("Pixel Buds A-Series.*");
     }
 
-    @Override
-    public int getBondingStyle(){
-        return BONDING_STYLE_ASK;
-    }
-
     @Override
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/polar/PolarH10DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/polar/PolarH10DeviceCoordinator.java
index 7949c8bccf..0c1a80fdf7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/polar/PolarH10DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/polar/PolarH10DeviceCoordinator.java
@@ -28,11 +28,6 @@ public class PolarH10DeviceCoordinator extends AbstractDeviceCoordinator {
         return R.drawable.ic_device_default;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Polar Electro Oy";
@@ -75,6 +70,4 @@ public class PolarH10DeviceCoordinator extends AbstractDeviceCoordinator {
         QueryBuilder<?> qb = session.getPolarH10ActivitySampleDao().queryBuilder();
         qb.where(PolarH10ActivitySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
     }
-
-
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qc35/QC35Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qc35/QC35Coordinator.java
index 2506b167fd..45590e2636 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qc35/QC35Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qc35/QC35Coordinator.java
@@ -81,9 +81,4 @@ public class QC35Coordinator extends AbstractBLClassicDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_headphones;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_headphones_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
index 9e5af11f9e..0a5632af31 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
@@ -342,11 +342,6 @@ public class QHybridCoordinator extends AbstractBLEDeviceCoordinator {
         return R.drawable.ic_device_zetime;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_zetime_disabled;
-    }
-
     @Override
     public boolean supportsNavigation() {
         return isHybridHR();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java
index 8d19544e77..64f5445be2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java
@@ -17,28 +17,16 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.roidmi;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 
 public abstract class RoidmiCoordinator extends AbstractBLClassicDeviceCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(RoidmiCoordinator.class);
-
     @Override
     public String getManufacturer() {
         return "Roidmi";
@@ -53,77 +41,6 @@ public abstract class RoidmiCoordinator extends AbstractBLClassicDeviceCoordinat
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return false;
-    }
-
     @Override
     public boolean supportsLedColor() {
         return true;
@@ -139,9 +56,4 @@ public abstract class RoidmiCoordinator extends AbstractBLClassicDeviceCoordinat
     public int getDefaultIconResource() {
         return R.drawable.ic_device_roidmi;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_roidmi_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/scannable/ScannableDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/scannable/ScannableDeviceCoordinator.java
index 2a1ef002ec..ba8f97d110 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/scannable/ScannableDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/scannable/ScannableDeviceCoordinator.java
@@ -60,9 +60,4 @@ public class ScannableDeviceCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_scannable;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_scannable_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSCoordinator.java
index 0a0b981f90..9fe96a5478 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSCoordinator.java
@@ -17,17 +17,10 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.smaq2oss;
 
-import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 import android.os.ParcelUuid;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -36,17 +29,13 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
+
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 
 public class SMAQ2OSSCoordinator extends AbstractBLEDeviceCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(SMAQ2OSSCoordinator.class);
-
     @NonNull
     @Override
     public Collection<? extends ScanFilter> createBLEScanFilters() {
@@ -69,72 +58,11 @@ public class SMAQ2OSSCoordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_NONE;
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "SMA";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
     @Override
     public boolean supportsWeather() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soflow/SoFlowCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soflow/SoFlowCoordinator.java
index ecfdcf963c..8250f9f4a3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soflow/SoFlowCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soflow/SoFlowCoordinator.java
@@ -17,22 +17,15 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.soflow;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;
 
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.soflow.SoFlowSupport;
 
@@ -42,76 +35,11 @@ public class SoFlowCoordinator extends AbstractBLEDeviceCoordinator {
         return Pattern.compile("SoFlow-.*");
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "SoFlow";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -156,9 +84,4 @@ public class SoFlowCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_vesc;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_vesc_disabled;
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
index 0e6871e904..a373d399d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
@@ -256,9 +256,4 @@ public abstract class SonyHeadphonesCoordinator extends AbstractBLClassicDeviceC
     public int getDefaultIconResource() {
         return R.drawable.ic_device_sony_overhead;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_sony_overhead_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsCoordinator.java
index 0daca818e7..6f827611c5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsCoordinator.java
@@ -66,9 +66,4 @@ public class SonyLinkBudsCoordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java
index 54bd2b7cf7..314f05031c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java
@@ -65,9 +65,4 @@ public class SonyLinkBudsSCoordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java
index f341f27367..62ad379b67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java
@@ -70,9 +70,4 @@ public class SonyWF1000XM3Coordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM4Coordinator.java
index c54edf519b..6e7717f0f9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM4Coordinator.java
@@ -67,9 +67,4 @@ public class SonyWF1000XM4Coordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM5Coordinator.java
index ddea69954e..4957d2933a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM5Coordinator.java
@@ -68,11 +68,6 @@ public class SonyWF1000XM5Coordinator extends SonyHeadphonesCoordinator {
         return R.drawable.ic_device_galaxy_buds;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
-
     @Override
     public boolean isExperimental() {
         // Ambient Sound Control is not 100% working
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC500Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC500Coordinator.java
index 3bd8b0f8cd..09732a98d3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC500Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC500Coordinator.java
@@ -52,9 +52,4 @@ public class SonyWFC500Coordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC510Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC510Coordinator.java
index f7f89a1265..bf159ac532 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC510Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC510Coordinator.java
@@ -56,9 +56,4 @@ public class SonyWFC510Coordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC700NCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC700NCoordinator.java
index 0be1ce4b42..5b22cbb575 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC700NCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC700NCoordinator.java
@@ -59,9 +59,4 @@ public class SonyWFC700NCoordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC710NCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC710NCoordinator.java
index 463cd4382b..88dbdcfe58 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC710NCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFC710NCoordinator.java
@@ -59,9 +59,4 @@ public class SonyWFC710NCoordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
index bd84d80da6..430ccb2fef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
@@ -69,9 +69,4 @@ public class SonyWFSP800NCoordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_sony_wf_800n;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_sony_wf_800n_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWIC100Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWIC100Coordinator.java
index 4889e2296b..2eae202d4f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWIC100Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWIC100Coordinator.java
@@ -52,9 +52,4 @@ public class SonyWIC100Coordinator extends SonyHeadphonesCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_galaxy_buds;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java
index bbb9acb9c0..f5b4709a09 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java
@@ -16,13 +16,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
-import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
 import android.content.Context;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -56,27 +54,11 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification.defines.VibrationKind;
 
 public class SonyWena3Coordinator extends AbstractBLEDeviceCoordinator {
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public String getManufacturer() {
         return "Sony";
     }
 
-    @Override
-    public boolean supportsAppsManagement(GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
@@ -138,11 +120,6 @@ public class SonyWena3Coordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
     @Override
     public boolean supportsActivityDataFetching() {
         return true;
@@ -153,12 +130,6 @@ public class SonyWena3Coordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
-
-    @Override
-    public boolean supportsAppReordering() {
-        return false;
-    }
-
     @Override
     public boolean supportsStressMeasurement() {
         return true;
@@ -169,11 +140,6 @@ public class SonyWena3Coordinator extends AbstractBLEDeviceCoordinator {
         return new SonyWena3StressSampleProvider(device, session);
     }
 
-    @Override
-    public boolean supportsSpo2(GBDevice device) {
-        return false;
-    }
-
     @Override
     public boolean supportsHeartRateMeasurement(GBDevice device) {
         return true;
@@ -200,11 +166,6 @@ public class SonyWena3Coordinator extends AbstractBLEDeviceCoordinator {
         return null;
     }
 
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount(GBDevice device) {
         return SonyWena3Constants.ALARM_SLOTS;
@@ -220,21 +181,11 @@ public class SonyWena3Coordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
-    @Override
-    public boolean supportsFindDevice() {
-        return false;
-    }
-
     @Override
     public boolean supportsWeather() {
         return true;
     }
 
-    @Override
-    public boolean isExperimental() {
-        return false;
-    }
-
     @Override
     public String[] getSupportedLanguageSettings(GBDevice device) {
         return new String[]{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12DeviceCoordinator.java
index b1d1de94c6..de9e549ab4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12DeviceCoordinator.java
@@ -17,19 +17,13 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sonyswr12;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
@@ -54,12 +48,6 @@ public class SonySWR12DeviceCoordinator extends AbstractBLEDeviceCoordinator {
 
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public boolean supportsActivityDataFetching() {
         return true;
@@ -75,16 +63,6 @@ public class SonySWR12DeviceCoordinator extends AbstractBLEDeviceCoordinator {
         return new SonySWR12SampleProvider(device, session);
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount(GBDevice device) {
         return 5;
@@ -100,36 +78,11 @@ public class SonySWR12DeviceCoordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
     @Override
     public boolean supportsRealtimeData() {
         return true;
     }
 
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return false;
-    }
-
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{R.xml.devicesettings_sonyswr12};
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/liberty3_pro/SoundcoreLiberty3ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/liberty3_pro/SoundcoreLiberty3ProCoordinator.java
index cb54a1e2c1..b476d1c8d5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/liberty3_pro/SoundcoreLiberty3ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/liberty3_pro/SoundcoreLiberty3ProCoordinator.java
@@ -27,11 +27,6 @@ public class SoundcoreLiberty3ProCoordinator extends AbstractDeviceCoordinator {
         return R.drawable.ic_device_galaxy_buds;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Anker";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/liberty4_nc/SoundcoreLiberty4NCCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/liberty4_nc/SoundcoreLiberty4NCCoordinator.java
index f73f71a1c6..8497a84113 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/liberty4_nc/SoundcoreLiberty4NCCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/liberty4_nc/SoundcoreLiberty4NCCoordinator.java
@@ -27,11 +27,6 @@ public class SoundcoreLiberty4NCCoordinator extends AbstractDeviceCoordinator {
         return R.drawable.ic_device_galaxy_buds;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_galaxy_buds_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Anker";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/q30/SoundcoreQ30Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/q30/SoundcoreQ30Coordinator.java
index 9c2772194d..d4b99e230c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/q30/SoundcoreQ30Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soundcore/q30/SoundcoreQ30Coordinator.java
@@ -26,11 +26,6 @@ public class SoundcoreQ30Coordinator extends AbstractDeviceCoordinator {
         return R.drawable.ic_device_headphones;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_headphones_disabled;
-    }
-
     @Override
     public String getManufacturer() {
         return "Anker";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsCoordinator.java
index 98a044a9b6..bddc2d1ab0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsCoordinator.java
@@ -72,11 +72,6 @@ public class SuperCarsCoordinator extends AbstractDeviceCoordinator {
         return R.drawable.ic_device_supercars;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_supercars_disabled;
-    }
-
     @Override
     public List<DeviceCardAction> getCustomActions() {
         return Collections.singletonList(new ControlDeviceCardAction());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java
index 0760cf0934..749b3283b4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java
@@ -609,12 +609,6 @@ public class TestDeviceCoordinator extends AbstractDeviceCoordinator {
         return super.getDefaultIconResource();
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        // TODO getDisabledIconResource
-        return super.getDisabledIconResource();
-    }
-
     @Override
     public boolean supportsNotificationVibrationPatterns() {
         return supports(getTestDevice(), TestFeature.NOTIFICATION_VIBRATION_PATTERNS);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Coordinator.java
index 0b42941a61..06cdb4e822 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Coordinator.java
@@ -18,12 +18,10 @@
 
 package nodomain.freeyourgadget.gadgetbridge.devices.tlw64;
 
-import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
 
@@ -40,7 +38,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.tlw64.TLW64Support;
 
 public class TLW64Coordinator extends AbstractBLEDeviceCoordinator {
-
     @Override
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
     }
@@ -50,12 +47,6 @@ public class TLW64Coordinator extends AbstractBLEDeviceCoordinator {
         return Pattern.compile("Smart Bee.*");
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public boolean supportsActivityDataFetching() {
         return true;
@@ -71,56 +62,16 @@ public class TLW64Coordinator extends AbstractBLEDeviceCoordinator {
         return new TLW64SampleProvider(device, session);
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount(GBDevice device) {
         return 3;
     }
 
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Toleda";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ultrahuman/UltrahumanDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ultrahuman/UltrahumanDeviceCoordinator.java
index 18c8e28095..8bb4ac3d1a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ultrahuman/UltrahumanDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ultrahuman/UltrahumanDeviceCoordinator.java
@@ -94,11 +94,6 @@ public class UltrahumanDeviceCoordinator extends AbstractBLEDeviceCoordinator {
         return R.drawable.ic_device_smartring;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_smartring_disabled;
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_ultrahuma_ring_air;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java
index b93507b837..27fe14a0f2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java
@@ -56,7 +56,6 @@ public class UM25Coordinator extends AbstractBLEDeviceCoordinator {
         );
     }
 
-    @NonNull
     @Override
     public boolean supports(GBDeviceCandidate candidate) {
         if(!"UM25C".equals(candidate.getName())) return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java
index 56369f0de2..fe7c0f881a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java
@@ -123,9 +123,4 @@ public class VescCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_vesc;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_vesc_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java
index c14977a2cc..f35a24b14e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java
@@ -18,8 +18,6 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.vibratissimo;
 
 import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
 
 import androidx.annotation.NonNull;
 
@@ -28,12 +26,9 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.vibratissimo.VibratissimoSupport;
@@ -49,71 +44,21 @@ public class VibratissimoCoordinator extends AbstractBLEDeviceCoordinator {
         return null;
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Amor AG";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public Class<? extends Activity> getAppsManagementActivity() {
         return null;
     }
 
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
     @Override
     public boolean supportsRealtimeData() {
         return false; // hmmm well, it has a temperature sensor :D
     }
 
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -135,20 +80,13 @@ public class VibratissimoCoordinator extends AbstractBLEDeviceCoordinator {
         // nothing to delete, yet
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_vibratissimo;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_lovetoy;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_lovetoy_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSCoordinator.java
index 1cc0ebdc77..8d87b44592 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSCoordinator.java
@@ -17,10 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.waspos;
 
-import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 import android.os.ParcelUuid;
 
 import androidx.annotation.NonNull;
@@ -31,7 +28,6 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
@@ -41,7 +37,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.waspos.WaspOSDeviceSupport;
 
 public class WaspOSCoordinator extends AbstractBLEDeviceCoordinator {
-
     @Override
     public String getManufacturer() {
         return "MicroPython";
@@ -67,80 +62,20 @@ public class WaspOSCoordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_NONE;
     }
 
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
     }
 
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-
     @Override
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) {
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
         return null;//new WaspOSSampleProvider(device, session);
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
@@ -159,14 +94,8 @@ public class WaspOSCoordinator extends AbstractBLEDeviceCoordinator {
         return R.string.devicetype_waspos;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_pebble;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_pebble_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java
index 6772543a11..2051600a19 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java
@@ -19,8 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.watch9;
 
 import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 import android.os.ParcelUuid;
 
 import java.util.Collection;
@@ -32,13 +30,10 @@ import androidx.annotation.Nullable;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.watch9.Watch9DeviceSupport;
@@ -57,7 +52,7 @@ public class Watch9DeviceCoordinator extends AbstractBLEDeviceCoordinator {
         return Collections.singletonList(filter);
     }
 
-    @NonNull
+    /** @noinspection RedundantIfStatement*/
     @Override
     public boolean supports(GBDeviceCandidate candidate) {
         String macAddress = candidate.getMacAddress().toUpperCase();
@@ -85,77 +80,16 @@ public class Watch9DeviceCoordinator extends AbstractBLEDeviceCoordinator {
         return Watch9PairingActivity.class;
     }
 
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount(GBDevice device) {
         return 3; // FIXME - check the real value
     }
 
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Lenovo";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return false;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java
index 473a6e75a7..b1216f9336 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java
@@ -16,12 +16,10 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr;
 
-import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.Locale;
 
@@ -49,15 +47,10 @@ public class WithingsSteelHRDeviceCoordinator extends AbstractDeviceCoordinator
         qb.where(WithingsSteelHRActivitySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
     }
 
-    @NonNull
     @Override
     public boolean supports(GBDeviceCandidate candidate) {
         String name = candidate.getName();
-        if (name != null && (name.toLowerCase(Locale.ROOT).startsWith("steel") || name.toLowerCase(Locale.ROOT).startsWith("activite"))) {
-            return true;
-        }
-
-        return false;
+        return name != null && (name.toLowerCase(Locale.ROOT).startsWith("steel") || name.toLowerCase(Locale.ROOT).startsWith("activite"));
     }
 
     @Override
@@ -72,13 +65,6 @@ public class WithingsSteelHRDeviceCoordinator extends AbstractDeviceCoordinator
         return BONDING_STYLE_BOND;
     }
 
-
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public boolean supportsRemSleep() {
         return true;
@@ -109,11 +95,6 @@ public class WithingsSteelHRDeviceCoordinator extends AbstractDeviceCoordinator
         return null;
     }
 
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount(GBDevice gbDevice) {
         return 3;
@@ -144,36 +125,11 @@ public class WithingsSteelHRDeviceCoordinator extends AbstractDeviceCoordinator
         return "Withings";
     }
 
-    @Override
-    public boolean supportsAppsManagement(GBDevice gbDevice) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
     @Override
     public boolean supportsRealtimeData() {
         return true;
     }
 
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return false;
-    }
-
     @Override
     public String[] getSupportedLanguageSettings(GBDevice device) {
         return new String[]{
@@ -192,20 +148,13 @@ public class WithingsSteelHRDeviceCoordinator extends AbstractDeviceCoordinator
         return WithingsSteelHRDeviceSupport.class;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.withings_steel_hr;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_watchxplus;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_watchxplus_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
index c96c803ef7..1d2e114998 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
@@ -43,11 +43,6 @@ public class MiBand7ProCoordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_default;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
-
     @Override
     public boolean supportsPai() {
         // no PAI nor vitality score
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index db608a332a..2918c4c5db 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -41,9 +41,4 @@ public class MiBand8Coordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband6;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband6_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8active/MiBand8ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8active/MiBand8ActiveCoordinator.java
index a0ce84e38c..62eb8883f9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8active/MiBand8ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8active/MiBand8ActiveCoordinator.java
@@ -41,9 +41,4 @@ public class MiBand8ActiveCoordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_default;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8pro/MiBand8ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8pro/MiBand8ProCoordinator.java
index 567def8e38..1551096310 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8pro/MiBand8ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8pro/MiBand8ProCoordinator.java
@@ -47,9 +47,4 @@ public class MiBand8ProCoordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_default;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9/MiBand9Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9/MiBand9Coordinator.java
index e096baf91d..a8a46202b5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9/MiBand9Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9/MiBand9Coordinator.java
@@ -37,11 +37,6 @@ public class MiBand9Coordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_miband6;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miband6_disabled;
-    }
-
     @Override
     public ConnectionType getConnectionType() {
         return ConnectionType.BT_CLASSIC;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9active/MiBand9ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9active/MiBand9ActiveCoordinator.java
index ec3c2ba7cf..3ced123c49 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9active/MiBand9ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9active/MiBand9ActiveCoordinator.java
@@ -48,9 +48,4 @@ public class MiBand9ActiveCoordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_default;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9pro/MiBand9ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9pro/MiBand9ProCoordinator.java
index f4e9b99045..eb8d6908dc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9pro/MiBand9ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband9pro/MiBand9ProCoordinator.java
@@ -47,9 +47,4 @@ public class MiBand9ProCoordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_default;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index 6730592f49..f5511f35ef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
@@ -43,11 +43,6 @@ public class MiWatchLiteCoordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_amazfit_bip;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @Override
     public boolean supportsCalendarEvents() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java
index d5f7e02b98..9b09bc0140 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java
@@ -42,9 +42,4 @@ public class MiWatchColorSportCoordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miwatch;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmibuds/AbstractRedmiBudsCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmibuds/AbstractRedmiBudsCoordinator.java
index b83d74a4ac..a5eb182a15 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmibuds/AbstractRedmiBudsCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmibuds/AbstractRedmiBudsCoordinator.java
@@ -67,9 +67,4 @@ public abstract class AbstractRedmiBudsCoordinator extends AbstractDeviceCoordin
     public int getDefaultIconResource() {
         return R.drawable.ic_device_nothingear;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_nothingear_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java
index 1ed86dd031..e86d206719 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java
@@ -41,9 +41,4 @@ public class RedmiSmartBand2Coordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_default;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
index cc6fd55514..12b9483049 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
@@ -43,11 +43,6 @@ public class RedmiSmartBandProCoordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_default;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_default_disabled;
-    }
-
     @Override
     public PasswordCapabilityImpl.Mode getPasswordCapability() {
         return PasswordCapabilityImpl.Mode.NUMBERS_4_DIGITS_0_TO_9;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2/RedmiWatch2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2/RedmiWatch2Coordinator.java
index e85485b101..30d68d278c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2/RedmiWatch2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2/RedmiWatch2Coordinator.java
@@ -41,9 +41,4 @@ public class RedmiWatch2Coordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2LiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2LiteCoordinator.java
index baccce9680..d3ad450770 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2LiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2LiteCoordinator.java
@@ -41,9 +41,4 @@ public class RedmiWatch2LiteCoordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3/RedmiWatch3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3/RedmiWatch3Coordinator.java
index 87c8b06040..350a0c2b3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3/RedmiWatch3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3/RedmiWatch3Coordinator.java
@@ -48,11 +48,6 @@ public class RedmiWatch3Coordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_amazfit_bip;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @Override
     public int getContactsSlotCount(final GBDevice device) {
         return 10; // TODO:verify
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
index 4df03f95f5..a8119c620b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
@@ -48,11 +48,6 @@ public class RedmiWatch3ActiveCoordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_amazfit_bip;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @Override
     public int getContactsSlotCount(final GBDevice device) {
         return 10; // TODO:verify
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch4/RedmiWatch4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch4/RedmiWatch4Coordinator.java
index 0141730a11..01e0bd40e1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch4/RedmiWatch4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch4/RedmiWatch4Coordinator.java
@@ -50,11 +50,6 @@ public class RedmiWatch4Coordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_amazfit_bip;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @Override
     public int getWorldClocksSlotCount() {
         return 20;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch5active/RedmiWatch5ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch5active/RedmiWatch5ActiveCoordinator.java
index d3292c878c..b143a2fb52 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch5active/RedmiWatch5ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch5active/RedmiWatch5ActiveCoordinator.java
@@ -23,7 +23,6 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
 public class RedmiWatch5ActiveCoordinator extends XiaomiCoordinator {
-
     @Override
     public ConnectionType getConnectionType() {
         return ConnectionType.BT_CLASSIC;
@@ -49,11 +48,6 @@ public class RedmiWatch5ActiveCoordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_amazfit_bip;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @Override
     public int getContactsSlotCount(final GBDevice device) { return 10; }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch5lite/RedmiWatch5LiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch5lite/RedmiWatch5LiteCoordinator.java
index b5627095ce..28f8d91e42 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch5lite/RedmiWatch5LiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch5lite/RedmiWatch5LiteCoordinator.java
@@ -23,7 +23,6 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
 public class RedmiWatch5LiteCoordinator extends XiaomiCoordinator {
-
     @Override
     public ConnectionType getConnectionType() {
         return ConnectionType.BT_CLASSIC;
@@ -44,11 +43,6 @@ public class RedmiWatch5LiteCoordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_amazfit_bip;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_amazfit_bip_disabled;
-    }
-
     @Override
     public int getContactsSlotCount(final GBDevice device) { return 10; }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1/XiaomiWatchS1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1/XiaomiWatchS1Coordinator.java
index a557e8cbc4..e7122a2f39 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1/XiaomiWatchS1Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1/XiaomiWatchS1Coordinator.java
@@ -22,7 +22,6 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 
 public class XiaomiWatchS1Coordinator extends XiaomiCoordinator {
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_xiaomi_watch_s1;
@@ -33,11 +32,6 @@ public class XiaomiWatchS1Coordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public ConnectionType getConnectionType() {
         // TODO make sure that the device can actually communicate in BLE mode
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
index 602d5b94bf..f86b3cf888 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
@@ -16,15 +16,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.Nullable;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 
 public class XiaomiWatchS1ActiveCoordinator extends XiaomiCoordinator {
@@ -58,9 +52,4 @@ public class XiaomiWatchS1ActiveCoordinator extends XiaomiCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miwatch;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1pro/XiaomiWatchS1ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1pro/XiaomiWatchS1ProCoordinator.java
index 9cd486dacc..cbd4475606 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1pro/XiaomiWatchS1ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1pro/XiaomiWatchS1ProCoordinator.java
@@ -50,11 +50,6 @@ public class XiaomiWatchS1ProCoordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs3/XiaomiWatchS3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs3/XiaomiWatchS3Coordinator.java
index d13a40ca77..0fe8210030 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs3/XiaomiWatchS3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs3/XiaomiWatchS3Coordinator.java
@@ -32,11 +32,6 @@ public class XiaomiWatchS3Coordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_miwatch;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_miwatch_disabled;
-    }
-
     @Override
     public ConnectionType getConnectionType() {
         return ConnectionType.BT_CLASSIC;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java
index 9873ba6c67..4d4725f802 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java
@@ -22,7 +22,6 @@ import android.content.Context;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
 
@@ -49,12 +48,6 @@ public class XWatchCoordinator extends AbstractBLEDeviceCoordinator {
 
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public boolean supportsActivityDataFetching() {
         return true;
@@ -75,51 +68,16 @@ public class XWatchCoordinator extends AbstractBLEDeviceCoordinator {
         return null;
     }
 
-    @Override
-    public boolean supportsScreenshots(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Generic";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
     @Override
     public Class<? extends Activity> getAppsManagementActivity() {
         return null;
     }
 
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -131,7 +89,6 @@ public class XWatchCoordinator extends AbstractBLEDeviceCoordinator {
         return XWatchSupport.class;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_xwatch;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java
index 65bb44baf3..6daba4cd48 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java
@@ -201,9 +201,4 @@ public class ZeTimeCoordinator extends AbstractBLEDeviceCoordinator {
     public int getDefaultIconResource() {
         return R.drawable.ic_device_zetime;
     }
-
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_zetime_disabled;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
index a15ad380a4..d8496c9053 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
@@ -621,12 +621,6 @@ public class GBDevice implements Parcelable {
         this.mBatteryLabels[index] = label;
     }
 
-    public int getEnabledDisabledIconResource(){
-        return isInitialized() ?
-                getDeviceCoordinator().getDefaultIconResource() :
-                getDeviceCoordinator().getDisabledIconResource();
-    }
-
     @NonNull
     @Override
     public String toString() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/gatt_client/BleGattClientCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/gatt_client/BleGattClientCoordinator.java
index ec6ac45730..d9aa187296 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/gatt_client/BleGattClientCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/gatt_client/BleGattClientCoordinator.java
@@ -39,11 +39,6 @@ public class BleGattClientCoordinator extends AbstractBLEDeviceCoordinator {
         return R.drawable.ic_device_scannable;
     }
 
-    @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_scannable_disabled;
-    }
-
     @Override
     protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
 
diff --git a/app/src/main/res/drawable/ic_device_air_conditioning_disabled.xml b/app/src/main/res/drawable/ic_device_air_conditioning_disabled.xml
deleted file mode 100644
index 708f09c044..0000000000
--- a/app/src/main/res/drawable/ic_device_air_conditioning_disabled.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.7dp"
-    android:height="28.7dp"
-    android:viewportWidth="28.74"
-    android:viewportHeight="28.74">
-
-    <!--
-        Adapted from https://www.svgrepo.com/svg/493976/air-conditioner
-    -->
-
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871,3.877L24.796,3.877A0.947,0.947 0,0 1,25.744 4.824L25.744,24.834A0.947,0.947 0,0 1,24.796 25.782L3.871,25.782A0.947,0.947 0,0 1,2.924 24.834L2.924,4.824A0.947,0.947 0,0 1,3.871 3.877z"
-        android:strokeWidth="3.57115"
-        android:strokeColor="#00000000" />
-
-    <path
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.035L24.804,3.035A0.947,0.947 0,0 1,25.751 3.982L25.751,23.992A0.947,0.947 0,0 1,24.804 24.94L3.879,24.94A0.947,0.947 0,0 1,2.932 23.992L2.932,3.982A0.947,0.947 0,0 1,3.879 3.035z"
-        android:strokeWidth="3.57115"
-        android:strokeColor="#00000000" />
-
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871,3.413L24.796,3.413A0.947,0.947 0,0 1,25.743 4.36L25.743,24.37A0.947,0.947 0,0 1,24.796 25.318L3.871,25.318A0.947,0.947 0,0 1,2.924 24.37L2.924,4.36A0.947,0.947 0,0 1,3.871 3.413z"
-        android:strokeWidth="3.57115"
-        android:strokeColor="#00000000" />
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m12.078,22.988c-0.077,0 -0.123,-0.015 -0.185,-0.046 -0.277,-0.185 -1.584,-1.153 -0.492,-3.075 0.292,-0.523 0.369,-0.938 0.261,-1.276 -0.123,-0.384 -0.523,-0.538 -0.523,-0.538 -0.185,-0.077 -0.277,-0.292 -0.2,-0.477 0.062,-0.154 0.185,-0.246 0.338,-0.246 0.046,0 0.092,0.015 0.138,0.031 0.062,0 0.707,0.277 0.969,0.969 0.2,0.554 0.092,1.199 -0.323,1.922 -0.769,1.353 0.046,1.953 0.215,2.06 0.169,0.092 0.231,0.323 0.138,0.507 -0.092,0.123 -0.231,0.169 -0.338,0.169zM14.569,22.173c-0.077,0 -0.123,-0.015 -0.185,-0.046 -0.554,-0.323 -1.338,-1.322 -0.461,-2.891 0.261,-0.477 0.338,-0.861 0.231,-1.153 -0.108,-0.338 -0.461,-0.477 -0.461,-0.477 -0.2,-0.077 -0.292,-0.277 -0.215,-0.477 0.062,-0.154 0.185,-0.246 0.338,-0.246 0.046,0 0.092,0.015 0.138,0.031 0.154,0.062 0.692,0.308 0.907,0.923 0.185,0.523 0.092,1.122 -0.292,1.784 -0.738,1.322 0.154,1.86 0.2,1.876 0.077,0.046 0.138,0.123 0.169,0.215 0.031,0.092 0.015,0.2 -0.031,0.292 -0.092,0.123 -0.231,0.169 -0.338,0.169zM9.464,22.173c-0.077,0 -0.123,-0.015 -0.185,-0.046C8.726,21.804 7.942,20.804 8.819,19.236c0.261,-0.477 0.338,-0.861 0.231,-1.153 -0.108,-0.338 -0.461,-0.477 -0.461,-0.477 -0.2,-0.077 -0.292,-0.277 -0.215,-0.477 0.062,-0.154 0.185,-0.246 0.338,-0.246 0.046,0 0.092,0.015 0.138,0.031 0.154,0.062 0.692,0.323 0.907,0.923 0.185,0.523 0.077,1.122 -0.292,1.799 -0.738,1.322 0.154,1.86 0.2,1.876 0.077,0.046 0.138,0.123 0.169,0.215 0.031,0.092 0.015,0.2 -0.031,0.292 -0.077,0.108 -0.231,0.154 -0.338,0.154zM18.828,20.804c-0.123,0 -0.215,-0.046 -0.292,-0.123 -0.077,-0.077 -0.123,-0.185 -0.123,-0.292 0,-0.169 0.108,-0.323 0.261,-0.4l0.015,0l0,-0.83l-0.784,0.446l0,0.015c0,0.123 -0.046,0.277 -0.2,0.354 -0.062,0.046 -0.138,0.062 -0.215,0.062 -0.154,0 -0.292,-0.077 -0.354,-0.2 -0.062,-0.108 -0.077,-0.215 -0.046,-0.323 0.031,-0.108 0.092,-0.2 0.2,-0.246 0.062,-0.046 0.138,-0.062 0.2,-0.062 0.077,0 0.154,0.015 0.215,0.062l0.707,-0.4 -0.692,-0.4c-0.092,0.031 -0.169,0.046 -0.231,0.046 -0.077,0 -0.138,-0.015 -0.2,-0.046 -0.185,-0.123 -0.261,-0.384 -0.154,-0.569 0.077,-0.123 0.215,-0.2 0.369,-0.2 0.077,0 0.154,0.015 0.215,0.062 0.123,0.077 0.2,0.2 0.2,0.354l0,0.015L18.705,18.575l0,-0.83l-0.015,0c-0.154,-0.077 -0.261,-0.231 -0.261,-0.4 0,-0.231 0.185,-0.415 0.415,-0.415 0.123,0 0.231,0.046 0.308,0.123 0.077,0.077 0.123,0.185 0.123,0.292 0,0.138 -0.077,0.277 -0.215,0.354L19.012,17.698L19.012,18.498l0.677,-0.384l0,-0.015c0,-0.123 0.046,-0.277 0.2,-0.354 0.062,-0.046 0.138,-0.062 0.215,-0.062 0.154,0 0.292,0.077 0.354,0.2 0.062,0.108 0.077,0.215 0.046,0.323 -0.031,0.108 -0.092,0.2 -0.2,0.246 -0.062,0.046 -0.138,0.062 -0.2,0.062 -0.077,0 -0.154,-0.015 -0.215,-0.062l-0.707,0.4 0.692,0.4c0.092,-0.031 0.169,-0.046 0.231,-0.046 0.077,0 0.138,0.015 0.2,0.046 0.185,0.123 0.261,0.384 0.154,0.569 -0.077,0.123 -0.215,0.2 -0.369,0.2 -0.077,0 -0.154,-0.015 -0.215,-0.062 -0.123,-0.077 -0.2,-0.2 -0.2,-0.354l0,-0.015L19.012,19.221l0,0.8l0.015,0c0.138,0.062 0.215,0.2 0.215,0.354 0,0.246 -0.185,0.431 -0.415,0.431zM7.635,15.946C6.466,15.946 5.528,15.008 5.528,13.839L5.528,8.827C5.528,7.658 6.466,6.721 7.635,6.721l13.868,0c1.169,0 2.106,0.938 2.106,2.106l0,5.012c0,1.169 -0.938,2.106 -2.106,2.106zM7.419,7.643c-0.554,0 -0.999,0.461 -0.999,1.046L6.42,14.039c0,0.569 0.446,1.046 0.999,1.046L21.703,15.085c0.554,0 0.999,-0.461 0.999,-1.046L22.702,8.689c0,-0.569 -0.446,-1.046 -0.999,-1.046zM7.835,13.639c-0.2,0 -0.369,-0.169 -0.369,-0.369 0,-0.2 0.169,-0.369 0.369,-0.369l13.115,0c0.2,0 0.369,0.169 0.369,0.369 0,0.2 -0.169,0.369 -0.369,0.369zM7.835,12.087c-0.2,0 -0.369,-0.169 -0.369,-0.369 0,-0.2 0.169,-0.369 0.369,-0.369l13.115,0c0.2,0 0.369,0.169 0.369,0.369 0,0.2 -0.169,0.369 -0.369,0.369z" />
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml b/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml
deleted file mode 100644
index 84730f7a6b..0000000000
--- a/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M11.342 7.48c-0.814-0.017-0.908 0.155-0.885 0.966-0.72 0.126-1.342 1.159-1.325 2.124l0.005 7.825c0.093 0.883 0.625 1.487 1.32 1.867 0 0.813 0.077 0.99 0.885 0.99h5.81c0.847 0 0.826-0.236 0.805-0.99 0.872-0.416 1.21-0.892 1.295-1.867l0.002-3.437c0.123-0.205 0.151-0.028 0.22 0.05 0.093 0.11 0.213 0.063 0.266-0.09l0.003-1.14c-0.055-0.114-0.1-0.213-0.25-0.117-0.078 0.049-0.11 0.22-0.24 0.085v-3.444c-0.087-0.903-0.473-1.51-1.295-1.838 0.007-0.945-0.06-0.991-0.806-0.98zm0.051 1.427l5.775 0.052c0.805 0.007 1.471 0.828 1.47 1.343l-0.028 7.942c-0.003 0.832-0.717 1.512-1.443 1.512h-5.925c-0.536 0-1.498-0.65-1.492-1.426l0.062-7.878c0.008-0.957 0.761-1.554 1.58-1.546z" />
-    <path
-        android:fillAlpha="0.731"
-        android:fillColor="#ffffff"
-        android:pathData="M11.392 8.907c-0.819-0.007-1.572 0.59-1.58 1.547L9.75 18.33c-0.006 0.776 0.956 1.425 1.492 1.425h5.924c0.725 0 1.44-0.68 1.443-1.512l0.027-7.942c0.002-0.515-0.664-1.336-1.469-1.343zm-0.482 1.812h6.567v6.696H10.91z"
-        android:strokeAlpha="0.731" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_banglejs_disabled.xml b/app/src/main/res/drawable/ic_device_banglejs_disabled.xml
deleted file mode 100644
index d7a69c79d1..0000000000
--- a/app/src/main/res/drawable/ic_device_banglejs_disabled.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M12.278 6.399h4.542a0.425 0.425 0 0 1 0.425 0.425v15.04a0.425 0.425 0 0 1-0.425 0.424h-4.542a0.425 0.425 0 0 1-0.425-0.425V6.824a0.425 0.425 0 0 1 0.425-0.425z"
-        android:strokeWidth="2.43489814" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M10.925 9.383h7.293a1.104 1.104 0 0 1 1.104 1.105v7.293a1.104 1.104 0 0 1-1.104 1.104h-7.293a1.104 1.104 0 0 1-1.105-1.104v-7.293a1.104 1.104 0 0 1 1.105-1.104z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M19 13.485h0.407a0.26 0.26 0 0 1 0.26 0.261v1.556a0.26 0.26 0 0 1-0.26 0.26H19a0.26 0.26 0 0 1-0.26-0.26v-1.556a0.26 0.26 0 0 1 0.26-0.26z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M11.725 10.422h5.706a0.866 0.838 90 0 1 0.838 0.866v5.008a0.866 0.838 90 0 1-0.838 0.866h-5.706a0.866 0.838 90 0 1-0.838-0.866v-5.008a0.866 0.838 90 0 1 0.838-0.866z"
-        android:strokeWidth="5.10916853" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_car_disabled.xml b/app/src/main/res/drawable/ic_device_car_disabled.xml
deleted file mode 100644
index 81832afc34..0000000000
--- a/app/src/main/res/drawable/ic_device_car_disabled.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.74dp"
-    android:height="28.74dp"
-    android:viewportWidth="28.74"
-    android:viewportHeight="28.74">
-
-    <!--
-        Car icon is licensed under the public domain: https://www.svgrepo.com/svg/535249/car
-    -->
-
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871,3.877L24.796,3.877A0.947,0.947 0,0 1,25.744 4.824L25.744,24.834A0.947,0.947 0,0 1,24.796 25.782L3.871,25.782A0.947,0.947 0,0 1,2.924 24.834L2.924,4.824A0.947,0.947 0,0 1,3.871 3.877z"
-        android:strokeWidth="3.57115"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.035L24.804,3.035A0.947,0.947 0,0 1,25.751 3.982L25.751,23.992A0.947,0.947 0,0 1,24.804 24.94L3.879,24.94A0.947,0.947 0,0 1,2.932 23.992L2.932,3.982A0.947,0.947 0,0 1,3.879 3.035z"
-        android:strokeWidth="3.57115"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871,3.413L24.796,3.413A0.947,0.947 0,0 1,25.743 4.36L25.743,24.37A0.947,0.947 0,0 1,24.796 25.318L3.871,25.318A0.947,0.947 0,0 1,2.924 24.37L2.924,4.36A0.947,0.947 0,0 1,3.871 3.413z"
-        android:strokeWidth="3.57115"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="?attr/deviceIconOnPrimary"
-        android:fillType="evenOdd"
-        android:pathData="M9.12,7.865 L7.719,11.584L5.966,11.584l0,2.789l1.051,0l0,6.508l2.103,0l0,-1.859l10.514,0l0,1.859l2.103,0L21.737,14.373l1.051,0L22.789,11.584L21.036,11.584L19.634,7.865ZM10.172,15.303C9.591,15.303 9.12,15.719 9.12,16.232 9.12,16.746 9.591,17.162 10.172,17.162 10.752,17.162 11.223,16.746 11.223,16.232 11.223,15.719 10.752,15.303 10.172,15.303ZM18.119,9.724L10.636,9.724L9.234,13.443L19.521,13.443ZM18.583,15.303c-0.581,0 -1.051,0.416 -1.051,0.93 0,0.513 0.471,0.93 1.051,0.93 0.581,0 1.051,-0.416 1.051,-0.93 0,-0.513 -0.471,-0.93 -1.051,-0.93z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_default_disabled.xml b/app/src/main/res/drawable/ic_device_default_disabled.xml
deleted file mode 100644
index d1f118eb1b..0000000000
--- a/app/src/main/res/drawable/ic_device_default_disabled.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57" />
-    <path
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M12.15 9.904h4.576a0.507 0.567 0 0 1 0.507 0.567v7.836a0.507 0.567 0 0 1-0.507 0.567h-4.577a0.507 0.567 0 0 1-0.507-0.567V10.47a0.507 0.567 0 0 1 0.507-0.567zm0.582 9.735h3.382v1.45h-3.382zM12.705 7.642h3.382v1.45h-3.382z" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_even_realities_g1_disabled.xml b/app/src/main/res/drawable/ic_device_even_realities_g1_disabled.xml
deleted file mode 100644
index 2ea73be0a4..0000000000
--- a/app/src/main/res/drawable/ic_device_even_realities_g1_disabled.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57" />
-    <path
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57" />
-    <path
-        android:fillColor="#fcfcfc"
-        android:pathData= "m 9.26,11.01c -2.72,-0.06 -5.67,0.62 -5.83,0.92 -0.11,0.21 -0.11,0.21 0.56,0.21 0.72,0 0.72,0 0.64,0.41 -0.07,0.36 -0.12,0.39 -0.76,0.39 -0.29,0 -0.52,0.01 -0.52,0.02 0,0.74 1.18,0.05 1.44,1.27 0.63,2.91 1.4,3.08 3.11,3.26 3.47,0.35 4.4,-0.32 5.47,-3.94 0.28,-0.97 1.65,-0.97 1.94,0 1.07,3.63 1.92,4.25 5.37,3.94 2.39,-0.26 2.81,-1.38 3.21,-3.24 0.27,-1.25 1.44,-0.53 1.44,-1.29 0,-0.01 -0.23,-0.02 -0.52,-0.02 -0.64,0 -0.69,-0.02 -0.76,-0.39 -0.07,-0.41 -0.08,-0.41 0.64,-0.41 0.67,0 0.67,0 0.56,-0.21 -0.22,-0.43 -6.36,-1.68 -9.12,-0.27 -0.94,0.48 -2.94,0.36 -3.58,0 -0.86,-0.44 -2.05,-0.62 -3.29,-0.65z"
-        />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="m 8.84,11.43c -0.32,0 -0.66,0.01 -1.01,0.04 -1.69,0.11 -3.13,0.27 -2.51,2.79 0.48,1.94 0.38,2.48 2.1,2.79 1.99,0.36 4.07,0.33 4.93,-1.77 0.32,-0.78 0.54,-2.15 0.41,-2.54 -0.29,-0.87 -1.69,-1.32 -3.92,-1.3z"
-        />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="m 19.85,11.44c -2.23,-0.02 -3.63,0.44 -3.92,1.31 -0.13,0.39 0.09,1.75 0.41,2.54 0.67,1.87 1.72,1.98 3.55,1.88 2.7,-0.16 2.88,-0.62 3.49,-2.95 0.58,-2.07 -0.75,-2.62 -2.52,-2.74 -0.35,-0.02 -0.69,-0.04 -1.01,-0.04z"
-        />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_flipper_disabled.xml b/app/src/main/res/drawable/ic_device_flipper_disabled.xml
deleted file mode 100644
index e8cbd61cac..0000000000
--- a/app/src/main/res/drawable/ic_device_flipper_disabled.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115" />
-    <path
-        android:fillAlpha="0.941176"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M19.143 17.496h0.913v-0.249h-1.161v0.249zm-6.219-0.249h-0.456v0.207h0.456z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M8.096 17.415l0.001-0.249 0.249 0.002-0.001 0.249zM7.638 17.45l0.002-0.248 0.248 0.001-0.001 0.249zM7.18 17.445l0.002-0.25 0.249 0.002-0.001 0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M20.263 17.04v-0.25h-0.457v0.249h0.25v0.207h0.207l0.249 0.042h0.456v-0.25h-0.456z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M12.236 17.241l0.002-0.249 0.249 0.002-0.002 0.249zM8.307 17.21l0.001-0.249 0.249 0.002-0.001 0.249zM7.85 17.204v-0.249l0.25 0.002-0.002 0.249zm-0.458-0.006l0.001-0.249 0.249 0.002-0.001 0.248zm-0.458-0.006l0.002-0.249 0.249 0.002-0.002 0.248z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M21.673 17.04v-0.207h-0.456l-0.25-0.042v0.249h0.458z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M8.56 16.964v-0.249l0.25 0.001-0.002 0.25zm-0.458-0.006l0.001-0.249 0.249 0.001-0.001 0.25zm-0.458-0.006l0.002-0.249 0.249 0.001-0.002 0.25zm-0.457 0.035l0.001-0.249 0.249 0.002-0.001 0.249zM6.73 16.981v-0.249l0.25 0.002-0.002 0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M21.88 16.584h-0.207v0.249h0.456v-0.25zm-2.53 0.207h0.458v-0.207H19.35z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M8.313 16.753l0.001-0.249 0.249 0.001-0.001 0.25zm-0.458-0.006l0.002-0.249 0.248 0.001v0.25zM7.398 16.74l0.001-0.248 0.25 0.001-0.002 0.249zM6.94 16.735l0.002-0.25 0.249 0.002-0.002 0.249zm-0.457-0.006l0.001-0.25 0.25 0.002-0.002 0.249zM8.108 16.5l0.001-0.248 0.25 0.001-0.002 0.249zM7.65 16.494l0.002-0.248H7.9l-0.002 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M7.193 16.53l0.001-0.249 0.249 0.001-0.001 0.25zm-0.457-0.006v-0.25l0.25 0.002-0.002 0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M20.056 14.718V14.51h0.248v-0.25h0.208v-0.207h0.248v-0.248h0.25v-0.208h0.207V13.35h0.248v-0.208h0.208v-0.249h0.248v-0.207h0.208v-0.249h0.249v-0.912H22.17v-0.207h-0.249l-0.248-0.042h-0.208V11.07h-2.073v0.207h-0.456v0.25H18.48v0.206h-0.456v-0.207h-0.249v-0.497h-0.207V10.57h-0.249v-0.207h-0.207v-0.249h-0.25V9.908h-0.206V9.659H16.2V9.41h-0.457V9.203H15.04V8.954h-1.161V8.747L13.67 8.706h-3.234v0.248H9.524v0.208H8.818V9.41H8.613v0.208H8.156L8.114 9.867H7.907l-0.25-0.042v0.249H7.452v0.249H7.2v0.207H6.996v0.249h-0.25v0.207H6.539l-0.041 0.249v0.207H6.29v0.456H6.04v0.456H5.835v0.706H6.04v-0.458h0.25v-0.455h0.207v-0.456h0.249v-0.456h0.249v-0.249h0.207v-0.207H7.45v-0.25h0.207v-0.206h0.249v-0.25h0.457V9.868h0.456v-0.25h2.778V9.41H9.731V9.162h0.954V8.954h2.986v0.25h0.207V9.41h0.248V9.203h0.208V9.41h1.161v0.457h0.207l0.249 0.041h0.456v0.207h0.249v0.25h0.207v0.206h0.249v0.25h0.207v0.662h-0.207l-0.042 0.248h0.705v0.459h0.456v-0.21h0.456v-0.249h0.456v-0.207h0.498v-0.249h1.576v0.25h0.704v0.248h0.208v0.207h-0.912v0.249h-0.664v0.207h-0.497v0.25h-0.208L19.6 12.644v0.248h-0.207v0.25h-0.249v0.207h-0.207v0.248h-0.249v0.208H18.48l-0.042 0.248h-0.207v0.208h-0.249v0.249h-0.207v0.207h-0.249v0.249H17.32v0.207h-0.25v0.249h-0.249v0.207h-0.207v0.249h-0.249v0.207h-0.207v0.249h-0.249v0.207h-0.207v0.249h-0.456l-0.042 0.207h-0.456v0.25h-0.663v0.206h-1.162v0.25h5.972v-0.208h-2.737v-0.498h0.207V16.79h0.25v-0.249h0.206v-0.207h1.618v0.249h0.911v-0.25h2.529l0.249 0.042v0.208h0.457v0.705h-0.249v0.207H22.13v0.249h-0.25v0.207h-0.207V18.2h-0.456l-0.042 0.207h-0.663v0.249h-0.706v0.207h-0.662l-0.041 0.249h-0.914v0.207h-0.91v0.25H16.82l-0.248-0.042v0.248h-0.208v0.25h1.617v-0.25h0.459V19.32h0.91v-0.207h0.705v-0.249h0.664v-0.207h0.705v-0.249h0.456v-0.207h0.249v-0.249h0.207v-0.207h0.249v-0.25h0.207v-0.662l0.042-0.248v-0.208h-0.25v-0.248h-3.896v-0.25h0.208V15.63l0.248 0.041v-0.248h0.208l0.041-0.25H19.6v-0.206h0.25v-0.25z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M7.862 16.29v-0.25l0.25 0.002L8.11 16.29zm-0.458-0.007l0.001-0.249 0.25 0.002-0.002 0.249zm-0.457-0.006v-0.249l0.25 0.002-0.002 0.249zM6.49 16.271v-0.249l0.25 0.002-0.002 0.248zm1.167-0.234v-0.249l0.25 0.001-0.002 0.25zM7.2 16.03v-0.248l0.25 0.001-0.002 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M6.742 16.066v-0.249l0.25 0.002-0.002 0.249zm2.04-0.222l0.002-0.249 0.249 0.001-0.002 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M8.322 15.381H8.114v0.207H7.865v0.25h0.25v0.207h0.207v0.248H8.57v0.208h0.208v0.248h0.248V17h0.208v-0.706h0.248v-0.457H9.026v0.456H8.778v-0.248H8.57v-0.208H8.321v-0.249z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M7.41 15.826l0.001-0.249 0.25 0.001-0.002 0.25zM6.953 15.82v-0.25l0.25 0.001-0.002 0.25zm-0.458-0.006l0.001-0.25 0.25 0.002-0.002 0.249zm1.168-0.234l0.001-0.25 0.249 0.002-0.002 0.249zm-0.458-0.007l0.001-0.248 0.25 0.001-0.002 0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M6.706 15.567l0.002-0.249 0.248 0.002v0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M8.778 15.381v-0.249H8.57v0.458h0.208z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M7.416 15.368l0.001-0.248h0.25l-0.002 0.25zm-0.457-0.006l0.001-0.248h0.249l-0.001 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M12.012 14.925v-1.244h-0.25v-0.498h-0.248v-0.248h-0.497v-0.249H9.772v0.249H9.276v0.249h-0.25v0.497H8.778v1.245h0.248v0.497h0.25v0.497h0.248v-0.248h0.497v-0.25h0.747v-0.248h1.492v-0.249zm-2.073-0.912v-0.249h0.498v0.498H9.938z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M7.17 15.116l0.001-0.249 0.249 0.001-0.001 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M12.924 13.764v1.161h0.705v-0.207h-0.456v-1.41h-0.25v0.249zm-4.602 1.369H8.57v-1.619H8.363v0.458L8.321 14.22v0.706z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M13.878 14.469h-0.25v0.249h0.458v-0.249z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M14.334 14.262h-0.25v0.207h0.458v-0.207zm0.456-0.249h-0.25v0.249h0.457v-0.249zm0.456-0.207h-0.249v0.207h0.456v-0.207zm-2.529 1.575v-1.824h-0.25v1.617H12.26v0.207h0.208z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M15.463 13.811l0.002-0.248h0.249l-0.002 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M15.95 13.35h-0.248v0.207h0.456V13.35zm-3.69-0.042v0.249h0.208V13.1H12.26zm-3.441 0.207V13.06H8.57v0.455zm-1.161 1.369v0.248h0.207v0.25h0.25v-2.074H7.906l-0.042 0.207v1.369z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M16.156 13.342l0.001-0.249 0.249 0.002-0.001 0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M16.614 12.893h-0.207v0.208h0.456v-0.208zm-1.617-0.041h-0.663v0.249h0.912v-0.208zM12.965 13.1v-0.248h-0.248v0.456h0.207z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M12.021 13.1l0.001-0.248h0.25l-0.002 0.25zm-3.202-0.042l0.001-0.249 0.249 0.002-0.001 0.248z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M8.114 12.852v0.457h0.249v-0.458z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M16.848 12.873l0.001-0.249 0.25 0.002-0.002 0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M15.495 12.645h-0.25v0.249h0.458v-0.25z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M14.103 12.878l0.002-0.249 0.248 0.002v0.249zm-1.601 0l0.001-0.249 0.25 0.001-0.002 0.25zm-0.686-0.03l0.001-0.249 0.25 0.002-0.002 0.248zM9.03 12.853l0.001-0.249 0.249 0.001-0.001 0.25zm-0.686-0.03l0.001-0.249 0.249 0.002-0.001 0.248z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M17.319 12.437H17.07v0.208h0.456l0.042-0.208zm-1.369-0.041h-0.248v0.249h0.456v-0.208z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M13.857 12.626l0.001-0.25 0.25 0.002-0.002 0.249zm-1.601-0.001l0.001-0.249 0.249 0.002-0.001 0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M11.348 12.603l0.208 0.042h0.248v-0.25h-0.456zm-1.866 0h0.25v-0.207H9.274v0.207z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M8.596 12.618l0.001-0.249 0.25 0.002-0.002 0.249zm8.944-0.214l0.002-0.249 0.249 0.002-0.002 0.248zm-1.372 0.023l0.001-0.248h0.25l-0.002 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M9.731 12.147v0.249h1.619v-0.249H9.98z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M8.807 12.372l0.002-0.25 0.248 0.002v0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M16.614 11.94h-0.207v0.249h0.456V11.98z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M15.235 12.186l0.002-0.248h0.249l-0.002 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M13.629 12.396h0.249v-0.664h-0.25v0.458zm-2.073-0.456v0.207h0.456v0.249h0.248v-0.249l0.25 0.042V11.69h-0.25v0.249h-0.248l0.041-0.249h-0.249v-0.207h-0.248v0.207H9.524l-0.042 0.25h1.866zm-2.281 0H9.026v0.207h0.456V11.94z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M16.86 11.958l0.002-0.249 0.248 0.002v0.249zm-1.83-0.024l0.002-0.249 0.249 0.002-0.002 0.248zm0.898-0.217l0.001-0.248h0.249l-0.001 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M14.784 11.723l0.001-0.249 0.25 0.002-0.002 0.248z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M14.085 11.732v-0.455h-0.207v0.456z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M12.04 11.687v-0.25l0.25 0.002-0.002 0.249zm3.683-0.18l0.001-0.25 0.249 0.002-0.002 0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M11.793 11.476l0.001-0.25 0.249 0.002-0.001 0.249zm4.827-0.186l0.001-0.249 0.249 0.001-0.001 0.25zm-1.144-0.036l0.002-0.249 0.248 0.001v0.25zm-1.372 0.023l0.001-0.249 0.249 0.002-0.001 0.249zm-2.058-0.047v-0.25l0.25 0.002-0.002 0.249zm4.369-0.193l0.001-0.248h0.25l-0.002 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M15.271 11.043l0.002-0.249 0.248 0.001v0.25zm-0.956-0.013l0.001-0.248 0.25 0.001-0.002 0.249z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M12.51 11.028v0.207h-0.25v0.249h0.25v0.207h0.207v-0.457h0.248v-0.455h-0.248v0.25z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M12.256 11.024l0.002-0.249 0.249 0.002-0.002 0.248zm-0.457-0.006L11.8 10.77l0.249 0.002-0.001 0.248zm4.37-0.192v-0.249l0.25 0.002-0.002 0.249zm-1.601-0.042v-0.249l0.25 0.002-0.002 0.249zm-1.602 0l0.002-0.249 0.249 0.001-0.002 0.25zm-0.457-0.006l0.001-0.249 0.25 0.001-0.002 0.25zm-0.457-0.006v-0.25l0.25 0.002-0.002 0.249zm3.912-0.198v-0.249l0.25 0.001-0.002 0.25z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M14.778 10.58l0.002-0.25 0.249 0.002-0.002 0.249zm-2.058-0.007l0.001-0.25 0.249 0.002-0.001 0.249zm-0.458-0.006l0.002-0.25 0.249 0.002-0.002 0.249zm2.769-0.234l0.001-0.249 0.25 0.002-0.002 0.248z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M12.717 10.323v-0.208h0.248V9.867H12.26v0.248h0.25v0.208z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M15.242 10.128l0.001-0.249 0.249 0.001-0.001 0.25zm-1.601-0.042l0.001-0.249 0.25 0.002-0.002 0.248z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M13.173 10.323v0.248h0.249v-0.248h0.207l0.041-0.208h-0.249V9.867h-0.248v0.248h-0.208v0.208z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M13.893 9.881l0.002-0.249 0.249 0.002-0.002 0.248zm-0.457-0.006l0.001-0.249 0.249 0.002-0.001 0.248z"
-        android:strokeWidth="1.0000112" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M12.053 9.867h0.207V9.659l-0.207-0.041h-0.456v0.249h0.207z"
-        android:strokeWidth="0.99999803" />
-    <path
-        android:fillColor="#fcfeff"
-        android:pathData="M14.104 9.635l0.002-0.25 0.249 0.002-0.002 0.249zm-0.457-0.006l0.001-0.25 0.25 0.002-0.002 0.249z"
-        android:strokeWidth="1.0000112" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_folder_disabled.xml b/app/src/main/res/drawable/ic_device_folder_disabled.xml
deleted file mode 100644
index 5fc4ee0701..0000000000
--- a/app/src/main/res/drawable/ic_device_folder_disabled.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-
-
-  <path
-      android:fillColor="#7a7a7a"
-      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-      android:strokeWidth="3.57115173"
-      android:strokeColor="#00000000" />
-  <path
-      android:fillAlpha="0.9411765"
-      android:fillColor="#9f9f9f"
-      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-      android:strokeWidth="3.57115173"
-      android:strokeColor="#00000000" />
-  <path
-      android:fillColor="#8a8a8a"
-      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-      android:strokeWidth="3.57115173"
-      android:strokeColor="#00000000" />
-  <path
-      android:fillAlpha="0.9411765"
-      android:fillColor="#8a8a8a"
-      android:pathData="m12.4827,10.8654h3.907v6.978h-3.907z" />
-
-  <path
-      android:pathData="M6.8,6.95C6.22,6.95 5.75,7.42 5.75,8L5.75,20.92C5.73,21 5.74,21.08 5.77,21.16C5.87,21.63 6.3,22 6.8,22L20.45,22C20.97,22 21.4,21.61 21.48,21.1C21.48,21.08 21.49,21.06 21.49,21.04C21.49,21.03 21.49,21.02 21.49,21.02L21.5,20.96C21.5,20.96 21.5,20.95 21.5,20.95L23.24,11.57L23.25,11.53L23.25,11.5C23.25,10.92 22.78,10.45 22.2,10.45L22.2,9.4C22.2,8.82 21.73,8.35 21.15,8.35L12.06,8.35C12.06,8.35 12.06,8.35 12.05,8.35C12.04,8.34 12.01,8.32 11.95,8.25C11.87,8.15 11.77,7.99 11.66,7.81C11.55,7.64 11.43,7.45 11.28,7.29C11.14,7.13 10.94,6.95 10.65,6.95ZM6.8,7.65L10.65,7.65C10.63,7.65 10.67,7.65 10.76,7.75C10.85,7.85 10.95,8.01 11.05,8.19C11.16,8.36 11.28,8.55 11.43,8.71C11.57,8.88 11.76,9.05 12.05,9.05L21.15,9.05C21.35,9.05 21.5,9.2 21.5,9.4L21.5,10.45L8.55,10.45C8,10.45 7.56,10.89 7.52,11.43L7.51,11.43L7.5,11.5L6.45,17.17L6.45,8C6.45,7.8 6.6,7.65 6.8,7.65ZM8.55,11.15L22.2,11.15C22.4,11.15 22.55,11.3 22.55,11.5L20.83,20.79L20.82,20.81C20.82,20.82 20.81,20.84 20.81,20.85C20.81,20.87 20.8,20.88 20.8,20.9C20.8,20.9 20.8,20.91 20.8,20.92C20.8,20.92 20.8,20.92 20.8,20.93C20.79,20.95 20.79,20.96 20.79,20.98C20.79,20.99 20.79,21 20.79,21.02C20.79,21.03 20.79,21.04 20.79,21.06C20.75,21.2 20.61,21.3 20.45,21.3L6.8,21.3C6.6,21.3 6.45,21.15 6.45,20.95L8.19,11.57L8.2,11.53L8.2,11.5C8.2,11.3 8.35,11.15 8.55,11.15Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_galaxy_buds_disabled.xml b/app/src/main/res/drawable/ic_device_galaxy_buds_disabled.xml
deleted file mode 100644
index 72280c82bb..0000000000
--- a/app/src/main/res/drawable/ic_device_galaxy_buds_disabled.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M21.522 19.793c0.616 0.866 0.173 2.2-1.533 2.201m-0.035-5.877c-1.155-0.468-1.978-0.451-3.04-0.143-0.498 0.145-0.888 0.736-0.928 1.257-0.186 2.404 1.257 3.576 2.712 3.47 0.892-0.065 1.79-1.2 2.005-2.193 0.18-0.835 0.036-2.073-0.75-2.391z"
-        android:strokeWidth="0.5"
-        android:strokeColor="#fcffff" />
-    <path
-        android:pathData="M18.948 15.002c-1.53-0.223-3.098 0.434-3.735 1.91-0.855 1.98 0.377 5.192 2.652 5.532 4.187 0.625 5.547-6.793 1.083-7.442"
-        android:strokeWidth="0.49999797"
-        android:strokeColor="#fcffff" />
-    <path
-        android:pathData="M18.032 13.173c0.662 0.176 1.074 1.094 1.583 1.523 0.681 0.574 1.442 0.888 1.89 1.711 0.342 0.627 0.249 1.521 0.611 2.072 0.19 0.289 0.567 0.422 0.782 0.708 0.667 0.89 0.593 2.232-0.208 3.014-0.528 0.515-1.36 0.727-2.075 0.56-0.304-0.07-0.598-0.326-0.916-0.3-0.745 0.062-1.207 0.429-2 0.22-2.802-0.736-3.851-4.044-3.23-6.61 0.327-1.358 1.966-3.322 3.563-2.898M11.07 6.31c-0.663 0.176-1.075 1.094-1.584 1.523-0.681 0.573-1.442 0.888-1.89 1.711-0.342 0.627-0.249 1.521-0.611 2.072-0.19 0.288-0.567 0.422-0.781 0.708-0.668 0.89-0.594 2.232 0.207 3.014 0.528 0.515 1.36 0.727 2.075 0.56 0.304-0.07 0.598-0.326 0.917-0.3 0.744 0.062 1.206 0.429 2 0.22 2.8-0.736 3.85-4.044 3.23-6.61-0.328-1.358-1.967-3.322-3.564-2.898"
-        android:strokeWidth="0.5"
-        android:strokeColor="#fcffff" />
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M7.58 12.93c-0.617 0.865-0.174 2.2 1.532 2.201m0.035-5.877c1.155-0.468 1.978-0.451 3.04-0.143 0.498 0.144 0.888 0.736 0.928 1.257 0.186 2.404-1.257 3.576-2.712 3.47-0.892-0.065-1.79-1.2-2.005-2.193-0.18-0.835-0.036-2.073 0.75-2.391z"
-        android:strokeWidth="0.5"
-        android:strokeColor="#fcffff" />
-    <path
-        android:pathData="M10.153 8.138c1.53-0.223 3.098 0.435 3.735 1.911 0.855 1.979-0.377 5.192-2.652 5.532-4.187 0.624-5.547-6.793-1.084-7.443"
-        android:strokeWidth="0.5"
-        android:strokeColor="#fcffff" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_galaxy_buds_live_disabled.xml b/app/src/main/res/drawable/ic_device_galaxy_buds_live_disabled.xml
deleted file mode 100644
index 26e25a9451..0000000000
--- a/app/src/main/res/drawable/ic_device_galaxy_buds_live_disabled.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-    <path
-        android:pathData="M11.564 17.14C10.61 17.978 9.3 18.237 8.29 17.787 7.214 17.31 6.474 16.17 6.46 14.97c-0.008-0.698 0.155-1.202 0.607-1.884 0.388-0.584 0.482-0.871 0.468-1.426-0.012-0.476-0.13-0.776-0.53-1.344-0.381-0.54-0.54-0.935-0.608-1.5-0.122-1.023 0.267-2.012 1.079-2.743 1.027-0.925 2.55-0.932 3.775-0.018 1.422 1.06 2.27 3.096 2.306 5.539 0.023 1.492-0.24 2.81-0.775 3.903-0.205 0.42-0.353 0.656-0.635 1.02-0.259 0.332-0.284 0.358-0.584 0.622z"
-        android:strokeWidth="0.7559051"
-        android:strokeColor="#fffffd" />
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M11.771 10.559s0.45 0.443 0.416 1.494c-0.028 0.888-0.539 1.302-0.539 1.302"
-        android:strokeWidth="0.7559051"
-        android:strokeColor="#fffffd" />
-    <path
-        android:pathData="M17.69 22.996c0.955 0.84 2.264 1.1 3.275 0.65 1.075-0.48 1.814-1.62 1.828-2.82 0.008-0.697-0.155-1.2-0.607-1.883-0.388-0.584-0.482-0.872-0.468-1.426 0.012-0.476 0.13-0.776 0.53-1.344 0.381-0.541 0.54-0.935 0.608-1.501 0.122-1.022-0.267-2.01-1.08-2.742-1.026-0.925-2.549-0.932-3.775-0.018-1.421 1.06-2.269 3.096-2.306 5.539-0.022 1.492 0.24 2.81 0.776 3.903 0.205 0.42 0.353 0.656 0.635 1.02 0.258 0.331 0.283 0.358 0.584 0.622z"
-        android:strokeWidth="0.7559051"
-        android:strokeColor="#fffffd" />
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M17.482 16.416s-0.45 0.443-0.415 1.494c0.028 0.888 0.539 1.302 0.539 1.302"
-        android:strokeWidth="0.7559051"
-        android:strokeColor="#fffffd" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_galaxy_buds_pro_disabled.xml b/app/src/main/res/drawable/ic_device_galaxy_buds_pro_disabled.xml
deleted file mode 100644
index 9d9584b39a..0000000000
--- a/app/src/main/res/drawable/ic_device_galaxy_buds_pro_disabled.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="m12.4827,10.8654h3.907v6.978h-3.907z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m21.2919,23.2015c0.6342,-0.1548 1.0149,-0.392 1.4344,-0.894 0.7094,-0.8486 0.8512,-2.1283 0.3502,-3.158 -0.1582,-0.3251 -0.377,-0.6401 -0.4861,-0.6999 -0.1847,-0.1012 -0.1868,-0.1424 -0.0305,-0.5933 0.4121,-1.1887 0.2451,-3.014 -0.384,-4.1977 -0.3848,-0.724 -1.2208,-1.4895 -1.8766,-1.7183 -1.3054,-0.4555 -3.136,0.051 -4.0509,1.1204 -1.418,1.6577 -1.7887,3.8542 -0.9565,5.6672 0.2793,0.6085 1.4226,1.7934 2.2541,2.3362 0.402,0.2624 0.6604,0.5313 0.7933,0.8255 0.4347,0.9623 1.8352,1.5845 2.9527,1.3118zM19.7347,22.8078c-0.4177,-0.1787 -0.9625,-0.6424 -1.1335,-0.9646 -0.0846,-0.1596 -0.0299,-0.161 0.5561,-0.0144 1.1521,0.2882 1.9675,0.0109 2.6995,-0.9215 0.3051,-0.3883 0.346,-0.5332 0.3978,-1.4115l0.0577,-0.9789 0.3002,0.3663c0.9623,1.1744 0.5377,3.1707 -0.821,3.8594 -0.5724,0.2901 -1.4649,0.3184 -2.0568,0.0651zM18.7182,21.4086c-1.1454,-0.4457 -2.8916,-2.0023 -3.2716,-2.9163 -0.9165,-2.2045 0.1396,-5.1562 2.19,-6.1208 0.9436,-0.4439 2.0937,-0.462 2.8908,-0.0454 1.6982,0.8873 2.465,3.4189 1.7138,5.6589 -0.1131,0.3371 -0.2067,0.9238 -0.208,1.3038 -0.0056,1.476 -0.786,2.3326 -2.1276,2.3341 -0.3572,0.0004 -0.8771,-0.0933 -1.1874,-0.2141zM18.7696,18.7483c0.0941,-0.1471 0.1413,-0.347 0.1049,-0.4442 -0.0365,-0.0973 -0.4674,-0.3424 -0.9577,-0.5448 -0.994,-0.4103 -1.2506,-0.3717 -1.2506,0.1881 0,0.2954 0.0735,0.3564 0.8303,0.6882 1.0117,0.4436 1.0587,0.4478 1.2731,0.1126z"
-        android:strokeWidth="0.499999"
-        android:strokeColor="#ffffff" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m7.8637,17.6849c-0.6433,-0.1548 -1.0294,-0.392 -1.455,-0.894 -0.7195,-0.8486 -0.8635,-2.1283 -0.3552,-3.158 0.1605,-0.3251 0.3824,-0.6401 0.4931,-0.6999 0.1874,-0.1012 0.1895,-0.1424 0.031,-0.5932 -0.418,-1.1887 -0.2486,-3.014 0.3895,-4.1977 0.3903,-0.724 1.2383,-1.4895 1.9035,-1.7183 1.3241,-0.4555 3.181,0.0509 4.1091,1.1204 1.4383,1.6578 1.8143,3.8542 0.9702,5.6672 -0.2833,0.6085 -1.443,1.7934 -2.2864,2.3362 -0.4078,0.2624 -0.6699,0.5313 -0.8047,0.8255 -0.4409,0.9623 -1.8616,1.5845 -2.995,1.3118zM9.4431,17.2912c0.4237,-0.1787 0.9763,-0.6423 1.1497,-0.9646 0.0858,-0.1596 0.0303,-0.161 -0.5641,-0.0144 -1.1687,0.2882 -1.9957,0.0108 -2.7382,-0.9215 -0.3095,-0.3882 -0.3509,-0.5332 -0.4035,-1.4115l-0.0586,-0.9789 -0.3045,0.3663c-0.9761,1.1744 -0.5454,3.1707 0.8327,3.8594 0.5806,0.2901 1.4859,0.3184 2.0864,0.0652zM10.4743,15.892c1.1618,-0.4457 2.9331,-2.0023 3.3186,-2.9163C14.7225,10.7711 13.6513,7.8195 11.5715,6.8549 10.6144,6.411 9.4477,6.3929 8.6392,6.8094c-1.7226,0.8873 -2.5003,3.419 -1.7384,5.6589 0.1147,0.3371 0.2096,0.9238 0.211,1.3038 0.0052,1.4759 0.7973,2.3326 2.1581,2.3341 0.3623,0.0004 0.8897,-0.0933 1.2044,-0.2141zM10.4222,13.2317c-0.0955,-0.1471 -0.1434,-0.347 -0.1064,-0.4442 0.037,-0.0973 0.4741,-0.3424 0.9715,-0.5448 1.0082,-0.4103 1.2686,-0.3717 1.2686,0.1881 0,0.2954 -0.0746,0.3564 -0.8422,0.6882 -1.0262,0.4436 -1.0739,0.4478 -1.2914,0.1126z"
-        android:strokeWidth="0.5"
-        android:strokeColor="#fffffd" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_h30_h10_disabled.xml b/app/src/main/res/drawable/ic_device_h30_h10_disabled.xml
deleted file mode 100644
index 5e898b0ac5..0000000000
--- a/app/src/main/res/drawable/ic_device_h30_h10_disabled.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#a1a1a1"
-        android:pathData="M4.036 2.923h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.778a0.854 0.854 0 0 1 0.854-0.855z"
-        android:strokeWidth="0.99516809" />
-    <path
-        android:fillColor="#7d7d7d"
-        android:pathData="M4.035 3.698h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.552a0.854 0.854 0 0 1 0.854-0.854z"
-        android:strokeWidth="0.99516809" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M4.034 3.328h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.182a0.854 0.854 0 0 1 0.854-0.854z"
-        android:strokeWidth="0.99516809" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M7.303 11.99h13.962a0.606 0.553 0 0 1 0.606 0.553v2.34a0.606 0.553 0 0 1-0.606 0.554H7.303a0.606 0.553 0 0 1-0.606-0.554v-2.34a0.606 0.553 0 0 1 0.606-0.553z"
-        android:strokeWidth="0.95947295" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M8.66 10.575h11.437a0.591 0.553 0 0 1 0.591 0.554v5.522a0.591 0.553 0 0 1-0.59 0.553H8.66a0.591 0.553 0 0 1-0.591-0.553V11.13a0.591 0.553 0 0 1 0.591-0.554z"
-        android:strokeWidth="0.98218656" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M9.393 11.68h10.088a0.613 0.553 0 0 1 0.613 0.554v3.047a0.613 0.553 0 0 1-0.613 0.553H9.393a0.613 0.553 0 0 1-0.613-0.553v-3.047a0.613 0.553 0 0 1 0.614-0.554z" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M17.609 13.76a0.738 0.751 0 1 0 1.477 0 0.738 0.751 0 1 0-1.477 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_headphones_disabled.xml b/app/src/main/res/drawable/ic_device_headphones_disabled.xml
deleted file mode 100644
index 15026d7d2b..0000000000
--- a/app/src/main/res/drawable/ic_device_headphones_disabled.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="vector"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-    <path
-        android:name="path_1"
-        android:pathData="M 3.871 3.877 L 24.796 3.877 C 25.047 3.877 25.289 3.977 25.466 4.154 C 25.644 4.332 25.744 4.573 25.744 4.824 L 25.744 24.834 C 25.744 25.085 25.644 25.327 25.466 25.504 C 25.289 25.682 25.047 25.782 24.796 25.782 L 3.871 25.782 C 3.62 25.782 3.379 25.682 3.201 25.504 C 3.024 25.327 2.924 25.085 2.924 24.834 L 2.924 4.824 C 2.924 4.573 3.024 4.332 3.201 4.154 C 3.379 3.977 3.62 3.877 3.871 3.877"
-        android:fillColor="#7a7a7a"
-        android:strokeWidth="1"/>
-    <path
-        android:name="path_5"
-        android:pathData="M 3.879 3.035 L 24.804 3.035 C 25.055 3.035 25.296 3.135 25.474 3.312 C 25.651 3.49 25.751 3.731 25.751 3.982 L 25.751 23.992 C 25.751 24.243 25.651 24.485 25.474 24.662 C 25.296 24.84 25.055 24.94 24.804 24.94 L 3.879 24.94 C 3.628 24.94 3.387 24.84 3.209 24.662 C 3.032 24.485 2.932 24.243 2.932 23.992 L 2.932 3.982 C 2.932 3.731 3.032 3.49 3.209 3.312 C 3.387 3.135 3.628 3.035 3.879 3.035"
-        android:fillColor="#9f9f9f"
-        android:strokeWidth="1"/>
-    <path
-        android:name="path_6"
-        android:pathData="M 3.879 3.035 L 24.804 3.035 C 25.055 3.035 25.296 3.135 25.474 3.313 C 25.652 3.49 25.751 3.731 25.751 3.982 L 25.751 23.992 C 25.751 24.244 25.652 24.485 25.474 24.662 C 25.296 24.84 25.055 24.94 24.804 24.94 L 3.879 24.94 C 3.628 24.94 3.387 24.84 3.209 24.662 C 3.032 24.485 2.932 24.244 2.932 23.992 L 2.932 3.982 C 2.932 3.731 3.032 3.49 3.209 3.313 C 3.387 3.135 3.628 3.035 3.879 3.035"
-        android:fillColor="#8a8a8a"
-        android:strokeWidth="1"/>
-    <path
-        android:name="path_7"
-        android:pathData="M 14.362 8.693 C 11.231 8.693 8.693 11.231 8.693 14.362 L 8.693 18.772 C 8.693 19.465 9.26 20.031 9.953 20.031 L 12.472 20.031 L 12.472 14.992 L 9.953 14.992 L 9.953 14.362 C 9.953 11.924 11.924 9.953 14.362 9.953 C 16.8 9.953 18.772 11.924 18.772 14.362 L 18.772 14.992 L 16.252 14.992 L 16.252 20.031 L 18.772 20.031 C 19.465 20.031 20.031 19.465 20.031 18.772 L 20.031 14.362 C 20.031 11.231 17.493 8.693 14.362 8.693 Z"
-        android:fillColor="#ffffff"
-        android:strokeWidth="1"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_hplus_disabled.xml b/app/src/main/res/drawable/ic_device_hplus_disabled.xml
deleted file mode 100644
index 15e6a0907f..0000000000
--- a/app/src/main/res/drawable/ic_device_hplus_disabled.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M19.932 9.383h0.397a0.53 0.53 0 0 1 0.53 0.53v0.53a0.53 0.53 0 0 1-0.53 0.531h-0.397a0.53 0.53 0 0 1-0.53-0.53v-0.53a0.53 0.53 0 0 1 0.53-0.53z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M9.848 7.218h8.986a1.142 1.142 0 0 1 1.142 1.142v12.123a1.142 1.142 0 0 1-1.142 1.142H9.848a1.142 1.142 0 0 1-1.142-1.142V8.36a1.142 1.142 0 0 1 1.142-1.142z"
-        android:strokeWidth="3.46226358" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M10.076 9.295h8.441V19.37h-8.44z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M11.181 10.62h6.276v7.514H11.18z"
-        android:strokeWidth="3.5" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_itag_disabled.xml b/app/src/main/res/drawable/ic_device_itag_disabled.xml
deleted file mode 100644
index c6072c708b..0000000000
--- a/app/src/main/res/drawable/ic_device_itag_disabled.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#a1a1a1"
-        android:pathData="M4.036 2.923h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.778a0.854 0.854 0 0 1 0.854-0.855z"
-        android:strokeWidth="0.99516809" />
-    <path
-        android:fillColor="#7d7d7d"
-        android:pathData="M4.035 3.698h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.552a0.854 0.854 0 0 1 0.854-0.854z"
-        android:strokeWidth="0.99516809" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M4.034 3.328h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.182a0.854 0.854 0 0 1 0.854-0.854z"
-        android:strokeWidth="0.99516809" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M13.939 11.822c0.726-0.005 2.73-0.031 3.09-0.659 0.359-0.627-0.642-2.35-1.01-2.974-0.367-0.622-1.392-2.332-2.118-2.328-0.727 0.005-1.73 1.728-2.09 2.356-0.359 0.627-1.338 2.364-0.97 2.986 0.367 0.623 2.37 0.624 3.098 0.619z"
-        android:strokeWidth="0.75212771" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M8.826 13.733c0.878-0.025 1.487 1.191 1.946 2.027 0.459 0.836 1.153 1.994 0.733 2.854-0.42 0.861-1.67 0.84-2.548 0.866-0.879 0.025-2.126 0.116-2.585-0.72-0.458-0.836 0.182-2.032 0.602-2.892 0.42-0.861 0.973-2.11 1.852-2.135z"
-        android:strokeWidth="0.64926457" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M13.91 7.294c-0.262 0.001-0.567 0.013-0.699-0.128-0.132-0.142 0.035-0.303 0.166-0.446 0.13-0.143 0.266-0.314 0.528-0.316 0.263 0 0.4 0.17 0.532 0.311 0.132 0.142 0.3 0.301 0.17 0.444-0.13 0.144-0.435 0.134-0.697 0.135zm-5.054 7.782c-0.238 0.001-0.58-0.025-0.699-0.154-0.12-0.128 0.012-0.328 0.13-0.458 0.118-0.129 0.327-0.302 0.564-0.303 0.237 0 0.447 0.17 0.567 0.299 0.119 0.128 0.253 0.327 0.135 0.456-0.118 0.13-0.46 0.159-0.697 0.16z" />
-    <path
-        android:fillColor="#fefefe"
-        android:pathData="M6.203 18.308a2.74 2.784 0 1 0 5.48 0 2.74 2.784 0 1 0-5.48 0z"
-        android:strokeWidth="1.24393165" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M16.627 14.652h3.905a0.854 0.854 0 0 1 0.854 0.854v3.905a0.854 0.854 0 0 1-0.854 0.854h-3.905a0.854 0.854 0 0 1-0.854-0.854v-3.905a0.854 0.854 0 0 1 0.854-0.854z" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M16.29 15.679a0.553 0.536 0 1 0 1.107 0 0.553 0.536 0 1 0-1.107 0z"
-        android:strokeWidth="1.06593406" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml b/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml
deleted file mode 100644
index 207d62f367..0000000000
--- a/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M7.279 12.118a4.008 4.008 0 1 1 8.015 0 4.008 4.008 0 1 1-8.015 0"
-        android:strokeWidth="3.69501472" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M13.592 12.106a4.008 4.008 0 1 1 8.015 0 4.008 4.008 0 1 1-8.015 0"
-        android:strokeWidth="3.69501472" />
-    <path
-        android:pathData="M8.1 13.594c1.956 3.307 6.76 7.152 6.76 7.152m6.035-7.436c-1.171 2.85-6.66 7.434-6.66 7.434"
-        android:strokeWidth="1"
-        android:strokeColor="#ffffff" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M14.154 19.504c-0.931-0.797-1.795-1.595-2.573-2.373-0.682-0.683-1.055-1.083-0.994-1.065 0.231 0.07 1.014 0.073 1.378 0.007 0.655-0.12 1.237-0.375 1.76-0.772 0.183-0.14 0.529-0.47 0.645-0.618l0.067-0.084 0.318 0.317c0.362 0.36 0.608 0.544 1.014 0.754 0.647 0.336 1.409 0.492 2.12 0.434 0.157-0.013 0.334-0.032 0.392-0.043 0.058-0.01 0.11-0.016 0.114-0.012 0.023 0.023-1.056 1.148-1.699 1.77-0.731 0.709-1.727 1.623-2.144 1.968-0.03 0.024-0.086-0.016-0.398-0.283z"
-        android:strokeWidth="0.07733981"
-        android:strokeColor="#ffffff" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_miband2_disabled.xml b/app/src/main/res/drawable/ic_device_miband2_disabled.xml
deleted file mode 100644
index 0044c1e15b..0000000000
--- a/app/src/main/res/drawable/ic_device_miband2_disabled.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M9.388 13.204h9.841a1.094 1.094 0 0 1 1.094 1.094v0.228a1.094 1.094 0 0 1-1.094 1.094H9.39a1.094 1.094 0 0 1-1.095-1.094v-0.228a1.094 1.094 0 0 1 1.094-1.094z"
-        android:strokeWidth="2.22514033"
-        android:strokeColor="#ffffff" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M17.313 14.401a1.405 1.405 0 1 1 2.81 0 1.405 1.405 0 1 1-2.81 0"
-        android:strokeWidth="3.82923341" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M17.69 14.403a1.03 1.03 0 1 1 2.06 0 1.03 1.03 0 1 1-2.06 0"
-        android:strokeWidth="2.80542302" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_miband6_disabled.xml b/app/src/main/res/drawable/ic_device_miband6_disabled.xml
deleted file mode 100644
index 81fc75e8a9..0000000000
--- a/app/src/main/res/drawable/ic_device_miband6_disabled.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M5.762 14.02l0.023-0.226c0.052-0.503 0.266-1.351 0.391-1.55 0.025-0.038 0.077-0.09 0.116-0.115 0.138-0.089 0.468-0.16 1.016-0.223 0.155-0.018 0.304-0.04 0.331-0.05 0.07-0.028 0.27-0.068 0.33-0.068 0.03 0 0.153-0.05 0.29-0.117 0.465-0.23 0.971-0.357 1.597-0.403 0.32-0.024 8.726-0.024 9.05 0 0.652 0.047 1.177 0.187 1.687 0.45l0.244 0.125 0.31 0.03c0.597 0.06 1.044 0.138 1.217 0.215 0.098 0.043 0.19 0.128 0.235 0.219 0.086 0.17 0.226 0.687 0.304 1.121 0.153 0.855 0.104 1.63-0.163 2.59-0.084 0.303-0.14 0.436-0.219 0.52-0.138 0.147-0.523 0.238-1.349 0.32l-0.335 0.032-0.277 0.14c-0.497 0.252-0.966 0.378-1.612 0.436-0.35 0.032-8.734 0.032-9.118 0-0.66-0.053-1.201-0.2-1.68-0.453C8.052 16.96 8 16.945 7.906 16.936c-0.066-0.006-0.168-0.025-0.227-0.043-0.059-0.017-0.266-0.051-0.46-0.075-0.767-0.095-0.967-0.168-1.08-0.392-0.052-0.103-0.187-0.563-0.247-0.844L5.851 15.39c-0.075-0.336-0.121-1.042-0.09-1.368z"
-        android:strokeWidth="3.77953" />
-    <path
-        android:fillColor="#9f9f9f"
-        android:pathData="M9.45 13.162h9.84c0.29 0 0.568 0.115 0.774 0.32 0.205 0.206 0.32 0.484 0.32 0.774v0.228c0 0.29-0.115 0.568-0.32 0.774-0.206 0.205-0.484 0.32-0.774 0.32H9.451c-0.192 0-0.38-0.05-0.547-0.146-0.167-0.096-0.305-0.234-0.4-0.4-0.097-0.167-0.148-0.356-0.148-0.548v-0.228c0-0.29 0.115-0.568 0.32-0.774 0.206-0.205 0.484-0.32 0.774-0.32z"
-        android:strokeWidth="2.22514"
-        android:strokeColor="#9f9f9f" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_miband_disabled.xml b/app/src/main/res/drawable/ic_device_miband_disabled.xml
deleted file mode 100644
index e1e6a1dbb8..0000000000
--- a/app/src/main/res/drawable/ic_device_miband_disabled.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M9.388 13.204h9.841a1.094 1.094 0 0 1 1.094 1.094v0.228a1.094 1.094 0 0 1-1.094 1.094H9.39a1.094 1.094 0 0 1-1.095-1.094v-0.228a1.094 1.094 0 0 1 1.094-1.094z"
-        android:strokeWidth="2.22514033"
-        android:strokeColor="#ffffff" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M11.468 14.392a0.458 0.458 0 1 1 0.916 0 0.458 0.458 0 1 1-0.916 0m2.437 0.008a0.458 0.458 0 1 1 0.916 0 0.458 0.458 0 1 1-0.916 0m2.385-0.01a0.458 0.458 0 1 1 0.916 0 0.458 0.458 0 1 1-0.916 0"
-        android:strokeWidth="1.34653521" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_miscale_disabled.xml b/app/src/main/res/drawable/ic_device_miscale_disabled.xml
deleted file mode 100644
index 5c56740e9d..0000000000
--- a/app/src/main/res/drawable/ic_device_miscale_disabled.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M4.034 3.328h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.182a0.854 0.854 0 0 1 0.854-0.854z"
-        android:strokeWidth="0.99516809" />
-    <path
-        android:fillColor="#7d7d7d"
-        android:pathData="M4.035 3.698h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.552a0.854 0.854 0 0 1 0.854-0.854z"
-        android:strokeWidth="0.99516809" />
-    <path
-        android:fillColor="#a1a1a1"
-        android:pathData="M4.036 2.923h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.778a0.854 0.854 0 0 1 0.854-0.855z"
-        android:strokeWidth="0.99516809" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M9.184 7.552h9.093a0.688 0.688 0 0 1 0.688 0.688v9.75a0.688 0.688 0 0 1-0.688 0.687H9.184a0.688 0.688 0 0 1-0.688-0.687V8.24a0.688 0.688 0 0 1 0.688-0.688z" />
-    <path
-        android:fillColor="#a1a1a1"
-        android:pathData="M11.173 10.053a3.66 3.265 92.127 0 1 2.63-1.47 3.66 3.265 92.127 0 1 2.607 1.475l-2.637 2.184z"
-        android:strokeWidth="0.93131608" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M11.965 11.201a2.982 2.265 90.871 0 1 1.824-1.197 2.982 2.265 90.871 0 1 1.807 1.202l-1.828 1.78z"
-        android:strokeWidth="0.70008069" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M12.568 9.52l0.254 0.365a0.09 0.09 100.007 0 1-0.022 0.124 0.09 0.09 100.007 0 1-0.124-0.021l-0.254-0.365a0.09 0.09 100.007 0 1 0.022-0.125 0.09 0.09 100.007 0 1 0.124 0.022z"
-        android:strokeWidth="0.8715741" />
-    <path
-        android:fillColor="#a1a1a1"
-        android:pathData="M16.387 10.182l-0.85 0.71a0.098 0.108 92.456 0 1-0.153-0.006 0.098 0.108 92.456 0 1 0.006-0.14l0.85-0.71a0.098 0.108 92.456 0 1 0.153 0.008 0.098 0.108 92.456 0 1-0.006 0.138z"
-        android:strokeWidth="0.43048036" />
-    <path
-        android:fillColor="#a1a1a1"
-        android:pathData="M11.305 10.04l0.858 0.692a0.107 0.097 81.04 0 1 0.024 0.15 0.107 0.097 81.04 0 1-0.136 0.021l-0.858-0.691a0.107 0.097 81.04 0 1-0.024-0.15 0.107 0.097 81.04 0 1 0.136-0.021z"
-        android:strokeWidth="0.42741153" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_miwatch_disabled.xml b/app/src/main/res/drawable/ic_device_miwatch_disabled.xml
deleted file mode 100644
index 667483f9f4..0000000000
--- a/app/src/main/res/drawable/ic_device_miwatch_disabled.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M17.39 6.396h0.637a0.499 0.499 0 0 1 0.499 0.5v14.377a0.499 0.499 0 0 1-0.499 0.498H17.39a0.499 0.499 0 0 1-0.499-0.498V6.895a0.499 0.499 0 0 1 0.499-0.499z"
-        android:strokeWidth="3.87336898" />
-    <group
-        android:translateX="20"
-        android:translateY="16"
-        android:rotation="30">
-        <path
-            android:fillColor="#ffffff"
-            android:pathData="M0 0h0.36a0.499 0.499 0 0 1 0.5 0.5v1.465a0.499 0.499 0 0 1-0.5 0.5h-0.36z"
-            android:strokeWidth="3.5" />
-    </group>
-    <group
-        android:translateX="18.75"
-        android:translateY="10"
-        android:rotation="-30">
-        <path
-            android:fillColor="#ffffff"
-            android:pathData="M0 0h0.36a0.499 0.499 0 0 1 0.5 0.5v1.465a0.499 0.499 0 0 1-0.5 0.5h-0.36z"
-            android:strokeWidth="3.5" />
-    </group>
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M10.667 6.396h0.638a0.499 0.499 0 0 1 0.498 0.5v14.377a0.499 0.499 0 0 1-0.498 0.498h-0.638a0.499 0.499 0 0 1-0.498-0.498V6.895a0.499 0.499 0 0 1 0.498-0.499z"
-        android:strokeWidth="3.87336898" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M8.456 14.053a5.923 6.099 0 1 0 11.846 0 5.923 6.099 0 1 0-11.846 0z"
-        android:strokeWidth="9.28846169" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M9.95 14.014a4.464 4.597 0 1 0 8.929 0 4.464 4.597 0 1 0-8.928 0z"
-        android:strokeWidth="7.00060892" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_nothingear_disabled.xml b/app/src/main/res/drawable/ic_device_nothingear_disabled.xml
deleted file mode 100644
index 799842b49b..0000000000
--- a/app/src/main/res/drawable/ic_device_nothingear_disabled.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57" />
-    <path
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m11.248,18.9974a2.6708,2.6529 90,0 1,-2.6529 -2.6708l0,-3.6234a5.5464,5.5093 89.9997,0 1,-3.3073 -1.6559,0.8903 0.8843,89.9998 0,1 -0.2299,-0.6054l0,-3.3652a0.8903,0.8843 89.9998,0 1,0.2299 -0.6054,5.6977 5.6596,90.0002 0,1 4.1916,-1.7182l0.1945,0a4.4513,4.4216 89.9998,0 1,4.227 4.4513l0,7.1222a2.6708,2.6529 90,0 1,-2.6529 2.6708zM6.8264,10.0947a4.113,4.0855 90.0003,0 0,2.6529 0.8903,0.8903 0.8843,89.9998 0,1 0.8843,0.8903l0,4.4513a0.8903,0.8843 90,0 0,1.7686 0L12.1323,9.2044a2.6708,2.6529 90,0 0,-2.5114 -2.6708l-0.1415,0a4.113,4.0855 90.0003,0 0,-2.6529 0.8903z"
-        android:strokeWidth="0.8872858" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M18.3225,24.339A2.6708,2.6529 90,0 1,15.6695 21.6682L15.6695,14.546a4.4513,4.4216 89.9998,0 1,4.227 -4.4513l0.1945,0a5.6977,5.6596 90.0002,0 1,4.1916 1.7182,0.8903 0.8843,89.9998 0,1 0.2299,0.6054l0,3.3652a0.8903,0.8843 89.9998,0 1,-0.2299 0.6054,5.5464 5.5093,89.9997 0,1 -3.3073,1.6559l0,3.6234a2.6708,2.6529 90,0 1,-2.6529 2.6708zM20.0911,11.8752l-0.1415,0a2.6708,2.6529 90,0 0,-2.5114 2.6708l0,7.1222a0.8903,0.8843 90.0003,0 0,1.7686 0l0,-4.4513a0.8903,0.8843 89.9998,0 1,0.8843 -0.8903,4.113 4.0855,90.0003 0,0 2.6529,-0.8903L22.744,12.7655a4.113,4.0855 90.0003,0 0,-2.6529 -0.8903z"
-        android:strokeWidth="0.8872858" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M8.595,8.7593m-0.8843,0a0.8903,0.8843 90.0003,1 1,1.7686 0a0.8903,0.8843 90.0003,1 1,-1.7686 0"
-        android:strokeWidth="0.8872858" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20.9754,14.1009m-0.8843,0a0.8903,0.8843 90.0003,1 1,1.7686 0a0.8903,0.8843 90.0003,1 1,-1.7686 0"
-        android:strokeWidth="0.8872858" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_pebble_disabled.xml b/app/src/main/res/drawable/ic_device_pebble_disabled.xml
deleted file mode 100644
index c7bad5400b..0000000000
--- a/app/src/main/res/drawable/ic_device_pebble_disabled.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.4" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.4" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.4" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M8.723 8.517H20.13V20.05H8.723z"
-        android:strokeWidth="3.4" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M8.723 7.068h1.585v14.438H8.723zm9.781 0h1.627v14.47h-1.627z"
-        android:strokeWidth="3.4" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M10.297 10.068h8.207v8.5h-8.207z"
-        android:strokeWidth="3.4" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M11.383 11.237h6v6.125h-6z"
-        android:strokeWidth="3.4" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M14.02 12.372h0.782v2.28h-0.781z"
-        android:strokeWidth="3.4" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M14.02 13.934h2.188v0.719h-2.187z"
-        android:strokeWidth="3.4" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_pinetime_disabled.xml b/app/src/main/res/drawable/ic_device_pinetime_disabled.xml
deleted file mode 100644
index 3bd626ff04..0000000000
--- a/app/src/main/res/drawable/ic_device_pinetime_disabled.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M12.278 6.399h4.542a0.425 0.425 0 0 1 0.425 0.425v15.04a0.425 0.425 0 0 1-0.425 0.424h-4.542a0.425 0.425 0 0 1-0.425-0.425V6.824a0.425 0.425 0 0 1 0.425-0.425z"
-        android:strokeWidth="2.43489814" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M10.925 9.383h7.293a1.104 1.104 0 0 1 1.104 1.105v7.293a1.104 1.104 0 0 1-1.104 1.104h-7.293a1.104 1.104 0 0 1-1.105-1.104v-7.293a1.104 1.104 0 0 1 1.105-1.104z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M9.827 13.176h0.406a0.26 0.26 0 0 1 0.26 0.261v1.556a0.26 0.26 0 0 1-0.26 0.26H9.827a0.26 0.26 0 0 1-0.261-0.26v-1.556a0.26 0.26 0 0 1 0.26-0.26z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M11.725 10.422h5.706a0.866 0.838 90 0 1 0.838 0.866v5.008a0.866 0.838 90 0 1-0.838 0.866h-5.706a0.866 0.838 90 0 1-0.838-0.866v-5.008a0.866 0.838 90 0 1 0.838-0.866z"
-        android:strokeWidth="5.10916853" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M14.767 14.932l1.185 0.432a0.097 0.267 90 0 1 0 0.137l-1.185 0.432a0.097 0.267 90 0 1-0.378 0l-1.185-0.431a0.097 0.267 90 0 1 0-0.138l1.185-0.432a0.097 0.267 90 0 1 0.378 0z"
-        android:strokeWidth="3.12518311" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M14.759 13.685l1.037 0.421a0.104 0.256 90 0 1 0 0.148l-1.037 0.421a0.104 0.256 90 0 1-0.362 0l-1.037-0.421a0.104 0.256 90 0 1 0-0.148l1.037-0.421a0.104 0.256 90 0 1 0.362 0z"
-        android:strokeWidth="2.83754849" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M14.727 12.458l0.96 0.435a0.095 0.21 90 0 1 0 0.134l-0.96 0.435a0.095 0.21 90 0 1-0.298 0l-0.96-0.434a0.095 0.21 90 0 1 0-0.135l0.96-0.435a0.095 0.21 90 0 1 0.298 0z"
-        android:strokeWidth="2.59477019" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M14.757 11.315l0.646 0.351a0.138 0.254 90 0 1 0 0.195l-0.646 0.351a0.138 0.254 90 0 1-0.358 0l-0.647-0.35a0.138 0.254 90 0 1 0-0.196l0.646-0.35a0.138 0.254 90 0 1 0.36 0z"
-        android:strokeWidth="2.1484313" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M14.472 15.782h0.211a0.094 0.094 0 0 1 0.094 0.094v0.376a0.094 0.094 0 0 1-0.094 0.094h-0.21a0.094 0.094 0 0 1-0.094-0.094v-0.376a0.094 0.094 0 0 1 0.093-0.094z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M13.708 13.196c0.88 0.416 0.869 0.35 0.119 0.658-0.75 0.31-0.67 0.347-0.801-0.377-0.131-0.725-0.2-0.697 0.682-0.281zm-0.08 1.239c0.983 0.415 0.97 0.35 0.132 0.658-0.837 0.31-0.747 0.347-0.893-0.378-0.146-0.724-0.222-0.696 0.76-0.28z"
-        android:strokeWidth="1.08117461" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M15.526 14.438c-0.983 0.415-0.97 0.35-0.132 0.658 0.837 0.31 0.747 0.347 0.893-0.378 0.146-0.724 0.222-0.696-0.76-0.28z"
-        android:strokeWidth="1.08117461" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M15.475 13.196c-0.881 0.416-0.87 0.35-0.12 0.659 0.751 0.309 0.671 0.347 0.802-0.378 0.13-0.724 0.199-0.696-0.682-0.28zm-0.122-1.234c-0.757 0.43-0.748 0.365-0.09 0.66 0.657 0.297 0.588 0.336 0.688-0.39 0.1-0.727 0.16-0.7-0.598-0.27zm-1.552-0.002c0.757 0.43 0.748 0.364 0.09 0.66-0.657 0.296-0.588 0.335-0.688-0.391-0.1-0.727-0.159-0.7 0.598-0.27z"
-        android:strokeWidth="1.08117461" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_roidmi_disabled.xml b/app/src/main/res/drawable/ic_device_roidmi_disabled.xml
deleted file mode 100644
index 9c7155f21c..0000000000
--- a/app/src/main/res/drawable/ic_device_roidmi_disabled.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M10.443 7.535h7.864a0.686 0.686 0 0 1 0.686 0.686v4.923a0.686 0.686 0 0 1-0.686 0.687h-7.864a0.686 0.686 0 0 1-0.686-0.687V8.221a0.686 0.686 0 0 1 0.686-0.686z"
-        android:strokeWidth="3.28026915" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M11.477 13.26h5.757a0.638 0.638 0 0 1 0.638 0.638v4.893a0.638 0.638 0 0 1-0.638 0.638h-5.757a0.638 0.638 0 0 1-0.638-0.638v-4.893a0.638 0.638 0 0 1 0.638-0.637z"
-        android:strokeWidth="2.83302426" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M12.844 19.175h3.042a0.342 0.342 0 0 1 0.341 0.341v1.856a0.342 0.342 0 0 1-0.341 0.342h-3.042a0.342 0.342 0 0 1-0.342-0.342v-1.855a0.342 0.342 0 0 1 0.342-0.342z"
-        android:strokeWidth="1.32303238" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M14.178 21.274h0.404a0.55 0.55 0 0 1 0.55 0.55v0.166a0.55 0.55 0 0 1-0.55 0.55h-0.404a0.55 0.55 0 0 1-0.549-0.55v-0.167a0.55 0.55 0 0 1 0.55-0.549z"
-        android:strokeWidth="0.5930993" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M10.377 7.316h7.995a0.214 0.214 0 0 1 0.214 0.214v5.073a0.214 0.214 0 0 1-0.214 0.213h-7.995a0.214 0.214 0 0 1-0.214-0.213V7.53a0.214 0.214 0 0 1 0.214-0.214z"
-        android:strokeWidth="2.9279027" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_scannable_disabled.xml b/app/src/main/res/drawable/ic_device_scannable_disabled.xml
deleted file mode 100644
index 3518e3caa9..0000000000
--- a/app/src/main/res/drawable/ic_device_scannable_disabled.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="vector"
-    android:width="30dp"
-    android:height="30dp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:name="path_3"
-        android:pathData="M 16.122 14.46 L 17.825 16.245 C 18.03 15.691 18.148 15.083 18.148 14.452 C 18.148 13.821 18.03 13.229 17.832 12.675 Z M 20.005 10.382 L 19.08 11.351 C 19.543 12.282 19.8 13.329 19.8 14.444 C 19.8 15.56 19.535 16.614 19.08 17.538 L 19.961 18.461 C 20.673 17.276 21.092 15.875 21.092 14.375 C 21.084 12.921 20.688 11.551 20.005 10.382 Z M 17.201 11.151 L 13.009 6.758 L 12.275 6.758 L 12.275 12.598 L 8.906 9.066 L 7.871 10.151 L 11.974 14.452 L 7.871 18.753 L 8.906 19.838 L 12.275 16.306 L 12.275 22.147 L 13.009 22.147 L 17.201 17.753 L 14.044 14.452 Z M 13.743 9.705 L 15.123 11.151 L 13.743 12.598 Z M 15.123 17.753 L 13.743 19.2 L 13.743 16.306 Z"
-        android:fillColor="#ffffff"
-        android:strokeWidth="1"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_smartring_disabled.xml b/app/src/main/res/drawable/ic_device_smartring_disabled.xml
deleted file mode 100644
index be74420515..0000000000
--- a/app/src/main/res/drawable/ic_device_smartring_disabled.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="30dp"
-    android:height="30dp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-  <path
-      android:fillColor="#7a7a7a"
-      android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-      android:strokeWidth="3.57115" />
-  <path
-      android:fillColor="#9f9f9f"
-      android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-      android:strokeWidth="3.57115" />
-  <path
-      android:fillColor="#8a8a8a"
-      android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-      android:strokeWidth="3.57115" />
-  <path
-      android:fillColor="#ffffff"
-      android:pathData="m16.822,6.557c-1.802,0.093 -3.48,1.006 -4.864,2.151 -2.034,1.673 -3.661,3.931 -4.462,6.492 -0.373,1.411 -0.603,3.061 0.246,4.345 0.832,1.273 2.524,1.476 3.854,1.052 2.34,-0.623 4.276,-2.305 5.808,-4.17 1.25,-1.606 2.256,-3.504 2.551,-5.56C20.091,9.587 19.974,8.058 18.895,7.217 18.311,6.74 17.557,6.552 16.822,6.557ZM16.562,6.807c1.111,-0.028 2.247,0.608 2.64,1.718 0.608,1.847 -0.088,3.815 -0.94,5.454 -1.266,2.356 -3.202,4.374 -5.555,5.571 -1.208,0.523 -2.658,1.011 -3.903,0.327 -1.192,-0.602 -1.611,-2.118 -1.402,-3.39 0.235,-2.183 1.391,-4.139 2.723,-5.802 1.574,-1.834 3.591,-3.481 6.005,-3.852 0.143,-0.018 0.287,-0.027 0.431,-0.027zM16.478,7.151c-2.089,0.145 -3.864,1.488 -5.336,2.921 -1.703,1.735 -3.072,3.953 -3.408,6.43 -0.124,1.064 0.068,2.31 1.003,2.943 0.056,-0.444 0.021,-1.19 0.144,-1.742 0.506,-2.767 2.122,-5.23 4.145,-7.077 1.549,-1.347 3.391,-2.532 5.467,-2.662 -0.48,-0.614 -1.28,-0.819 -2.015,-0.813zM20.07,8.265c0.22,0.778 0.373,1.666 0.23,2.502 -0.314,2.48 -1.628,4.709 -3.215,6.551 -1.628,1.831 -3.733,3.37 -6.157,3.76 -0.484,0.125 -1.407,-0.058 -1.619,0.002 0.68,0.587 1.331,1.29 2.243,1.466 1.36,0.301 2.764,-0.19 3.983,-0.789 3.143,-1.75 5.634,-4.861 6.431,-8.476C22.234,11.795 22.109,9.979 20.867,8.974 20.601,8.74 20.348,8.479 20.07,8.265Z"
-      android:strokeWidth="0.25"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_sony_overhead_disabled.xml b/app/src/main/res/drawable/ic_device_sony_overhead_disabled.xml
deleted file mode 100644
index 1f22932181..0000000000
--- a/app/src/main/res/drawable/ic_device_sony_overhead_disabled.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-    <path
-        android:fillColor="#fffffe"
-        android:pathData="M11.788 22.12s-2.091-0.292-2.658-1.225c-0.538-0.824-0.974-1.714-1.498-2.547-0.523-0.78-0.034-1.59 0.057-2.376-0.008-1.014-0.284-2.034-0.029-3.04 0.356-2.063 1.501-3.997 3.158-5.246 2.688-1.872 6.803-1.214 8.663 1.554 1.347 1.783 2.027 4.133 1.554 6.36-0.087 0.924 0.697 1.928 0.061 2.791-0.596 0.923-1.055 1.948-1.712 2.823-0.756 0.595-2.691 0.773-2.691 0.773s-1.515-0.619-1.65-1.431c0.042-0.632 0.5-1.138 0.746-1.702 0.841-1.549 1.744-3.066 2.737-4.52 0.49-0.445 1.602 0.74 1.564-0.408 0.076-1.294-0.51-2.515-1.13-3.606-0.52-0.856-1.367-1.458-2.317-1.715-2.033-0.69-4.431-0.473-6.166 0.868-1.16 1.256-1.893 2.974-1.84 4.71 0.301 0.858 1.157-0.49 1.686 0.352 0.606 0.62 0.904 1.47 1.406 2.171 0.729 1.2 1.437 2.42 1.999 3.712-0.01 0.972-1.94 1.702-1.94 1.702z"
-        android:strokeWidth="0.5"
-        android:strokeColor="#ffffff" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml b/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
deleted file mode 100644
index d8992d8d78..0000000000
--- a/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-    <path
-        android:pathData="M7.291 6.092L7.194 6.145C7.162 6.163 7.13 6.183 7.099 6.203l-0.1 0.067L6.89 6.35 6.815 6.405 6.74 6.466C6.691 6.507 6.642 6.55 6.595 6.595 6.547 6.64 6.5 6.685 6.455 6.734 6.41 6.78 6.365 6.83 6.323 6.88 6.28 6.93 6.24 6.983 6.2 7.035c-0.04 0.053-0.078 0.106-0.114 0.16C6.05 7.25 6.015 7.304 5.982 7.36L5.935 7.442C5.92 7.47 5.905 7.498 5.892 7.526c-0.037 0.071-0.07 0.14-0.1 0.206-0.03 0.065-0.058 0.128-0.083 0.19-0.025 0.061-0.047 0.12-0.067 0.18-0.01 0.03-0.02 0.059-0.028 0.088-0.01 0.03-0.017 0.058-0.025 0.088L5.567 8.366l-0.02 0.09c-0.011 0.06-0.021 0.12-0.03 0.184-0.008 0.063-0.015 0.13-0.02 0.198-0.007 0.069-0.01 0.14-0.014 0.217L5.477 9.219v0.157C5.478 9.428 5.48 9.478 5.483 9.527c0.003 0.05 0.007 0.099 0.012 0.147C5.5 9.722 5.505 9.77 5.513 9.818 5.52 9.866 5.529 9.914 5.538 9.961l0.033 0.144 0.042 0.146c0.015 0.05 0.031 0.1 0.05 0.15 0.018 0.051 0.037 0.103 0.059 0.156 0.02 0.053 0.044 0.108 0.068 0.163l0.079 0.173c0.028 0.059 0.058 0.12 0.09 0.182 0.031 0.063 0.065 0.128 0.1 0.196l0.113 0.209 0.125 0.224 0.19 0.325 0.188 0.312 0.184 0.3 0.182 0.287 0.18 0.275c0.059 0.09 0.117 0.177 0.176 0.262 0.058 0.086 0.116 0.17 0.173 0.251l0.17 0.24 0.169 0.227c0.055 0.074 0.11 0.146 0.165 0.217 0.054 0.07 0.108 0.138 0.162 0.205l0.008 0.01C8.02 14.582 7.132 13.792 6.67 13.21c-1.06-1.33-1.604-2.907-1.441-4.18 0.148-1.165 0.664-2.116 1.624-2.991C7.09 5.821 7.117 5.85 7.187 5.871 7.424 6.016 7.452 6.003 7.29 6.092z"
-        android:strokeWidth="0.4"
-        android:strokeColor="#ffffff" />
-    <path
-        android:pathData="M11.589 11.343c0.322-0.014 0.357 0.04 0.594-0.181 0.222-0.24 0.274-0.352 0.276-0.57 0.003-0.224-0.007-0.25-0.197-0.71-0.408-0.979-0.896-1.961-1.124-2.262-0.342-0.45-0.831-0.779-1.38-0.948-0.413-0.127-1.121-0.108-1.564 0.041-1.404 0.475-2.155 1.989-1.691 3.408 0.271 0.832 0.705 1.282 1.214 1.282z"
-        android:strokeWidth="0.3"
-        android:strokeColor="#ffffff" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M11.858 12.337a0.198 0.194 90 0 0 0.268 0.058 0.198 0.194 90 0 0 0.059-0.273 0.198 0.194 90 0 0-0.267-0.063 0.198 0.194 90 0 0-0.063 0.272"
-        android:strokeWidth="0.3"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:pathData="M11.87 10.803L8.042 10.87c-0.145 0.003-0.261 0.12-0.261 0.268 0 0.148 0.116 0.27 0.261 0.267l3.826-0.068c0.145-0.003 0.262-0.12 0.262-0.268 0-0.148-0.117-0.27-0.262-0.267z"
-        android:strokeWidth="0.3"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:pathData="M12.193 17.066c0.625-0.132 1.334-0.604 1.68-1.12 0.53-0.787 0.661-1.615 0.413-2.61-0.445-1.784-1.737-5.003-2.422-6.035-0.49-0.738-1.147-1.226-1.985-1.474-0.284-0.084-0.55-0.118-0.97-0.127-0.244-0.005-0.653 0.037-1.041 0.174-0.486 0.169-0.64 0.23-0.95 0.458-0.406 0.296-0.789 0.73-1.013 1.175-0.29 0.576-0.392 0.938-0.419 1.547-0.04 0.9 0.118 1.412 0.816 2.655 1.003 1.681 1.225 2.02 2.372 3.434 0.232 0.3 0.63 0.757 0.883 1.016 0.373 0.381 0.524 0.502 0.787 0.633 0.599 0.296 1.271 0.396 1.85 0.274zm9.319-4.474c0.034 0.017 0.066 0.034 0.097 0.053 0.032 0.018 0.064 0.037 0.096 0.058 0.032 0.02 0.064 0.043 0.099 0.067l0.109 0.079 0.075 0.057 0.075 0.06c0.05 0.041 0.098 0.084 0.146 0.129 0.047 0.044 0.094 0.09 0.14 0.138 0.045 0.048 0.089 0.097 0.131 0.148 0.043 0.05 0.084 0.102 0.124 0.154 0.04 0.052 0.078 0.106 0.114 0.16 0.036 0.054 0.07 0.109 0.103 0.164l0.047 0.083 0.044 0.083c0.036 0.072 0.07 0.14 0.1 0.206 0.03 0.066 0.057 0.129 0.082 0.19 0.025 0.062 0.047 0.121 0.067 0.18l0.029 0.088 0.025 0.088 0.022 0.089 0.019 0.089c0.012 0.06 0.022 0.121 0.03 0.185 0.009 0.063 0.016 0.129 0.021 0.198 0.006 0.068 0.01 0.14 0.014 0.217l0.005 0.164v0.157c0 0.051-0.003 0.102-0.006 0.151-0.002 0.05-0.006 0.098-0.011 0.147-0.005 0.048-0.011 0.096-0.019 0.144-0.007 0.048-0.015 0.095-0.025 0.143-0.01 0.048-0.02 0.096-0.033 0.144-0.012 0.048-0.026 0.097-0.041 0.146-0.015 0.05-0.032 0.1-0.05 0.15-0.018 0.051-0.038 0.103-0.06 0.156-0.02 0.053-0.043 0.107-0.068 0.163-0.024 0.056-0.05 0.113-0.079 0.172-0.028 0.06-0.058 0.12-0.09 0.183-0.03 0.063-0.064 0.128-0.1 0.195l-0.113 0.21-0.124 0.224-0.19 0.325-0.188 0.312-0.185 0.3-0.182 0.286-0.179 0.275-0.176 0.263c-0.059 0.086-0.116 0.17-0.174 0.251l-0.17 0.24-0.168 0.227c-0.056 0.074-0.11 0.146-0.165 0.216-0.055 0.07-0.109 0.139-0.163 0.205l-0.008 0.01c0.224-0.032 1.112-0.822 1.575-1.403 1.06-1.332 1.603-2.909 1.44-4.182-0.148-1.165-0.664-2.116-1.623-2.991-0.239-0.218-0.265-0.188-0.334-0.167-0.238 0.144-0.265 0.132-0.105 0.22z"
-        android:strokeWidth="0.4"
-        android:strokeColor="#ffffff" />
-    <path
-        android:pathData="M17.215 17.843c-0.323-0.014-0.358 0.039-0.594-0.182-0.222-0.24-0.274-0.352-0.277-0.569-0.002-0.225 0.007-0.251 0.198-0.71 0.407-0.98 0.895-1.962 1.123-2.262 0.342-0.45 0.832-0.779 1.38-0.948 0.413-0.128 1.122-0.109 1.565 0.041 1.403 0.475 2.154 1.989 1.69 3.408-0.271 0.832-0.705 1.282-1.214 1.282z"
-        android:strokeWidth="0.3"
-        android:strokeColor="#ffffff" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M16.945 18.836a0.194 0.198 0 0 1-0.267 0.058 0.194 0.198 0 0 1-0.06-0.272 0.194 0.198 0 0 1 0.267-0.063 0.194 0.198 0 0 1 0.063 0.272"
-        android:strokeWidth="0.3"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:pathData="M16.934 17.302l3.826 0.069c0.145 0.002 0.262 0.119 0.262 0.267 0 0.148-0.117 0.27-0.262 0.268l-3.826-0.069c-0.145-0.002-0.261-0.119-0.261-0.267 0-0.148 0.116-0.27 0.261-0.268z"
-        android:strokeWidth="0.3"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:pathData="M16.61 23.566c-0.624-0.132-1.333-0.604-1.68-1.12-0.53-0.788-0.661-1.615-0.413-2.611 0.446-1.784 1.738-5.003 2.422-6.035 0.49-0.737 1.147-1.225 1.985-1.473 0.285-0.085 0.55-0.119 0.97-0.127 0.244-0.005 0.653 0.037 1.041 0.174 0.486 0.169 0.64 0.23 0.95 0.458 0.406 0.296 0.789 0.73 1.013 1.175 0.29 0.575 0.392 0.938 0.42 1.547 0.04 0.9-0.118 1.411-0.817 2.654-1.003 1.682-1.225 2.02-2.372 3.434-0.232 0.3-0.63 0.757-0.883 1.017-0.373 0.38-0.523 0.502-0.787 0.633-0.598 0.296-1.27 0.395-1.849 0.274z"
-        android:strokeWidth="0.4"
-        android:strokeColor="#ffffff" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_supercars_disabled.xml b/app/src/main/res/drawable/ic_device_supercars_disabled.xml
deleted file mode 100644
index f40c2fe0d4..0000000000
--- a/app/src/main/res/drawable/ic_device_supercars_disabled.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115" />
-    <path
-        android:fillAlpha="0.941176"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M21.841 13.785c-0.292-3.157-3.15-5.415-6.3-5.415-0.142 0-0.285 0.008-0.427 0.015C6.87 8.925 6.87 18.27 6.87 18.27v0.6c0 0.825 0.675 1.5 1.5 1.5h7.5c3.503 0 6.308-3.007 5.97-6.585zM9.316 14.04c0.428-0.967 0.96-1.762 1.605-2.392l2.715 1.147c0.45 0.188 0.735 0.623 0.735 1.11 0 0.668-0.54 1.208-1.207 1.208H8.91c0.113-0.345 0.24-0.705 0.405-1.073zm9.885 3.36c-0.855 0.938-2.07 1.47-3.33 1.47h-7.5v-0.6c0-0.015 0.008-0.69 0.18-1.65h4.613c1.492 0 2.707-1.215 2.707-2.707 0-1.088-0.652-2.07-1.65-2.49l-1.875-0.795c0.825-0.428 1.778-0.675 2.865-0.743 0.113-0.015 0.225-0.015 0.33-0.015 2.483 0 4.598 1.778 4.808 4.058 0.12 1.29-0.285 2.52-1.148 3.472z"
-        android:strokeWidth="0.9999975" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_thermometer_disabled.xml b/app/src/main/res/drawable/ic_device_thermometer_disabled.xml
deleted file mode 100644
index b97f8789ee..0000000000
--- a/app/src/main/res/drawable/ic_device_thermometer_disabled.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="45sp" android:viewportHeight="30" android:viewportWidth="30" android:width="45sp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#7a7a7a" android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z" android:strokeWidth="3.57115173"/>
-    <path android:fillAlpha="0.9411765" android:fillColor="#9f9f9f" android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.879a0.947 0.947 0 0 1-0.947-0.948V3.982a0.947 0.947 0 0 1 0.947-0.947z" android:strokeWidth="3.57115173"/>
-    <path android:fillColor="#8a8a8a" android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36a0.947 0.947 0 0 1 0.947-0.947z" android:strokeWidth="3.57115173"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M14.37 22.271c-1.093 0-2.024-0.385-2.794-1.156-0.771-0.77-1.156-1.702-1.156-2.795 0-0.632 0.138-1.221 0.415-1.767 0.276-0.547 0.665-1.011 1.165-1.393V8.839c0-0.658 0.231-1.218 0.691-1.679 0.462-0.461 1.021-0.691 1.679-0.691 0.659 0 1.218 0.23 1.68 0.691 0.46 0.461 0.691 1.021 0.691 1.679v6.321c0.5 0.382 0.889 0.846 1.165 1.393 0.277 0.546 0.415 1.135 0.415 1.767 0 1.093-0.385 2.025-1.156 2.795-0.77 0.771-1.702 1.156-2.795 1.156zm-0.79-8.691h1.581v-0.79H14.37V12h0.791v-1.581H14.37v-0.79h0.791v-0.79c0-0.224-0.076-0.411-0.228-0.563-0.151-0.151-0.339-0.227-0.563-0.227-0.223 0-0.411 0.076-0.563 0.227-0.151 0.152-0.227 0.339-0.227 0.563v4.741z" android:strokeWidth="0.55"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_unknown_disabled.xml b/app/src/main/res/drawable/ic_device_unknown_disabled.xml
deleted file mode 100644
index 330f03e513..0000000000
--- a/app/src/main/res/drawable/ic_device_unknown_disabled.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillAlpha="0.941176"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M15.634 17.365h-4.23v-0.574q0-0.96 0.387-1.699 0.386-0.75 1.629-1.898l0.75-0.68q0.668-0.61 0.972-1.148 0.317-0.54 0.317-1.079 0-0.82-0.563-1.277-0.562-0.469-1.57-0.469-0.95 0-2.05 0.399-1.103 0.386-2.298 1.16V6.42q1.418-0.492 2.59-0.727Q12.74 5.46 13.83 5.46q2.86 0 4.36 1.172 1.5 1.16 1.5 3.398 0 1.149-0.458 2.063-0.457 0.902-1.559 1.945l-0.75 0.668q-0.796 0.727-1.042 1.172-0.247 0.434-0.247 0.961zm-4.23 1.735h4.23v4.172h-4.23z"
-        android:strokeWidth="1" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_vesc_disabled.xml b/app/src/main/res/drawable/ic_device_vesc_disabled.xml
deleted file mode 100644
index b10e3e03ae..0000000000
--- a/app/src/main/res/drawable/ic_device_vesc_disabled.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillAlpha="0.941176"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#8a8a8a"
-        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
-    <path
-        android:fillColor="#fffffe"
-        android:pathData="M21.455 11.429l-1.047 1.575a6.811 6.811 55.425 0 1-0.188 6.454H8.42a6.811 6.811 65.813 0 1 8.948-9.493l1.575-1.048A8.514 8.514 107.27 0 0 6.956 20.31a1.703 1.703 0 0 0 1.464 0.85h11.792a1.703 1.703 0 0 0 1.481-0.851 8.514 8.514 51.806 0 0-0.23-8.889z"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#fffffe"
-        android:pathData="M13.12 17.253a1.703 1.703 0 0 0 2.41 0l4.818-7.229-7.228 4.82a1.703 1.703 0 0 0 0 2.409z"
-        android:strokeWidth="1" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml b/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml
deleted file mode 100644
index 71bbfa55c5..0000000000
--- a/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M17.39 6.396h0.637a0.499 0.499 0 0 1 0.499 0.5v14.377a0.499 0.499 0 0 1-0.499 0.498H17.39a0.499 0.499 0 0 1-0.499-0.498V6.895a0.499 0.499 0 0 1 0.499-0.499z"
-        android:strokeWidth="3.87336898" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20.07 12.786h0.36a0.499 0.499 0 0 1 0.5 0.499v1.466a0.499 0.499 0 0 1-0.5 0.499h-0.36a0.499 0.499 0 0 1-0.5-0.499v-1.466a0.499 0.499 0 0 1 0.5-0.499z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M10.667 6.396h0.638a0.499 0.499 0 0 1 0.498 0.5v14.377a0.499 0.499 0 0 1-0.498 0.498h-0.638a0.499 0.499 0 0 1-0.498-0.498V6.895a0.499 0.499 0 0 1 0.498-0.499z"
-        android:strokeWidth="3.87336898" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M8.456 14.053a5.923 6.099 0 1 0 11.846 0 5.923 6.099 0 1 0-11.846 0z"
-        android:strokeWidth="9.28846169" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M9.95 14.014a4.464 4.597 0 1 0 8.929 0 4.464 4.597 0 1 0-8.928 0z"
-        android:strokeWidth="7.00060892" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_device_zetime_disabled.xml b/app/src/main/res/drawable/ic_device_zetime_disabled.xml
deleted file mode 100644
index 9c2589dd6a..0000000000
--- a/app/src/main/res/drawable/ic_device_zetime_disabled.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-    <path
-        android:fillColor="#7a7a7a"
-        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillAlpha="0.9411765"
-        android:fillColor="#9f9f9f"
-        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
-        android:strokeWidth="3.57115173" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M11.81 6.366h4.515a0.55 0.55 0 0 1 0.55 0.55v14.9a0.55 0.55 0 0 1-0.55 0.548h-4.514a0.55 0.55 0 0 1-0.55-0.549v-14.9a0.55 0.55 0 0 1 0.55-0.549z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M14.047 21.438c-4.122-0.06-4.413-0.53-4.375-7.033 0.038-6.503 0.335-6.963 4.457-6.903 4.121 0.06 4.413 0.529 4.374 7.032-0.038 6.504-0.335 6.964-4.456 6.903z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M8.359 14.485a5.703 5.703 0 1 1 11.407 0 5.703 5.703 0 1 1-11.407 0"
-        android:strokeWidth="5.37907696" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M18.968 11.292a0.422 0.422 49.05 0 1 0.548 0.236l0.44 1.103a0.422 0.422 106.141 0 1-0.237 0.548 0.422 0.422 106.141 0 1-0.548-0.236l-0.439-1.103a0.422 0.422 49.05 0 1 0.236-0.548zm0.826 4.371a0.422 0.422 68.194 0 1 0.22 0.555l-0.472 1.09a0.422 0.422 60.234 0 1-0.555 0.219 0.422 0.422 60.234 0 1-0.22-0.555l0.472-1.09a0.422 0.422 68.194 0 1 0.555-0.22z"
-        android:strokeWidth="3.5" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M19.344 13.595h0.625a0.422 0.422 0 0 1 0.422 0.422v0.687a0.422 0.422 0 0 1-0.422 0.422h-0.625a0.422 0.422 0 0 1-0.422-0.422v-0.687a0.422 0.422 0 0 1 0.422-0.422z"
-        android:strokeWidth="3.29593801" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M9.766 14.407a4.312 4.312 0 1 1 8.624 0 4.312 4.312 0 1 1-8.624 0"
-        android:strokeWidth="9.89868832" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M12.265 12.175l2.21 2.21a0.344 0.344 0 0 1 0 0.486 0.344 0.344 0 0 1-0.486 0l-2.21-2.21a0.344 0.344 109.54 0 1 0-0.486 0.344 0.344 109.54 0 1 0.486 0z"
-        android:strokeWidth="2.75432277" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M14.344 14.305h1.906a0.344 0.344 0 0 1 0.344 0.344 0.344 0.344 0 0 1-0.344 0.344h-1.906A0.344 0.344 0 0 1 14 14.649a0.344 0.344 0 0 1 0.344-0.344z"
-        android:strokeWidth="2.27182031" />
-</vector>
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceTypeTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceTypeTest.java
index 04aa252336..6b4dfac398 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceTypeTest.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceTypeTest.java
@@ -30,7 +30,6 @@ public class DeviceTypeTest extends TestBase {
             final DeviceCoordinator coordinator = deviceType.getDeviceCoordinator();
             Assert.assertNotEquals("Device name for " + deviceType + " is 0", 0, coordinator.getDeviceNameResource());
             Assert.assertNotEquals("Device icon for " + deviceType + " is 0", 0, coordinator.getDefaultIconResource());
-            Assert.assertNotEquals("Disabled device icon for " + deviceType + " is 0", 0, coordinator.getDisabledIconResource());
             Assert.assertNotEquals("Manufacturer for " + deviceType + " is null", null, coordinator.getManufacturer());
         }
     }