diff --git a/devicesettings/AndroidManifest.xml b/devicesettings/AndroidManifest.xml
index c799a62..adc26e0 100644
--- a/devicesettings/AndroidManifest.xml
+++ b/devicesettings/AndroidManifest.xml
@@ -6,6 +6,9 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
 
     <uses-sdk
         android:minSdkVersion="28"
@@ -15,6 +18,8 @@
 
     <application
         android:label="@string/device_settings_app_name"
+        android:icon="@mipmap/ic_launcher"
+        android:banner="@mipmap/ic_banner"
         android:persistent="true">
 
         <service android:name=".DockService"
@@ -42,11 +47,11 @@
         <activity
             android:name=".DisplaySettingsActivity"
             android:label="@string/display_panel_title"
-            android:icon="@drawable/ic_settings_additional_buttons"
             android:theme="@style/Theme.Main">
             <intent-filter>
                 <action android:name="com.android.settings.action.IA_SETTINGS" />
                 <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             <meta-data
@@ -55,6 +60,9 @@
             <meta-data
                 android:name="com.android.settings.summary"
                 android:resource="@string/display_panel_summary" />
+            <meta-data
+                android:name="com.android.settings.icon"
+                android:resource="@drawable/ic_settings_additional_buttons" />
         </activity>
     </application>
 </manifest>
diff --git a/devicesettings/res/drawable/ic_settings_additional_buttons.xml b/devicesettings/res/drawable/ic_settings_additional_buttons.xml
index 5787e8b..eaf8b9d 100644
--- a/devicesettings/res/drawable/ic_settings_additional_buttons.xml
+++ b/devicesettings/res/drawable/ic_settings_additional_buttons.xml
@@ -5,6 +5,7 @@ from: https://github.com/neuicons/neu
 MIT License
 
 Copyright (c) 2020 Royyan Wijaya
+Copyright (c) 2023 Thomas Makin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -29,9 +30,10 @@ SOFTWARE.
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
 
     <path
-        android:fillColor="#757575"
+        android:fillColor="#000000"
         android:pathData="M23,12v6a1,1,0,0,1-1,1H13v2h3a1,1,0,0,1,0,2H8a1,1,0,0,1,0-2h3V19H2a1,1,0,0,1-1-1V4A1,1,0,0,1,2,3H12a1,1,0,0,1,0,2H3V17H21V12a1,1,0,0,1,2,0ZM21.585,6.075a0.417 0.417 ,0,0,0,0.079 0.458 l0.444 0.444 a0.4 0.4 ,0,0,1,0,0.571l-0.56 0.561 a0.4 0.4 ,0,0,1-0.571,0l-0.444-0.444a0.416 0.416 ,0,0,0-0.458-0.08l-0.006,0a0.416 0.416 ,0,0,0-0.269 0.38 V8.6a0.4 0.4 ,0,0,1-0.4 0.4 H18.6a0.4 0.4 ,0,0,1-0.4-0.4V7.968a0.415 0.415 ,0,0,0-0.27-0.38l0,0a0.417 0.417 ,0,0,0-0.459 0.08 l-0.444 0.444 a0.4 0.4 ,0,0,1-0.571,0l-0.56-0.561a0.4 0.4 ,0,0,1,0-0.571l0.444-0.444a0.415 0.415 ,0,0,0,0.079-0.458l0-0.006a0.416 0.416 ,0,0,0-0.381-0.269H15.4a0.4 0.4 ,0,0,1-0.4-0.4V4.6a0.4 0.4 ,0,0,1,0.4-0.4h0.628a0.415 0.415 ,0,0,0,0.381-0.27l0-0.005a0.415 0.415 ,0,0,0-0.079-0.458l-0.444-0.444a0.4 0.4 ,0,0,1,0-0.571l0.56-0.561a0.4 0.4 ,0,0,1,0.571,0l0.444 0.444 a0.417 0.417 ,0,0,0,0.459 0.08 l0,0a0.415 0.415 ,0,0,0,0.27-0.38V1.4a0.4 0.4 ,0,0,1,0.4-0.4H19.4a0.4 0.4 ,0,0,1,0.4 0.4 v0.628a0.416 0.416 ,0,0,0,0.269 0.38 l0.006,0a0.416 0.416 ,0,0,0,0.458-0.08l0.444-0.444a0.4 0.4 ,0,0,1,0.571,0l0.56 0.561 a0.4 0.4 ,0,0,1,0,0.571l-0.444 0.444 a0.417 0.417 ,0,0,0-0.079 0.458 l0,0.005a0.416 0.416 ,0,0,0,0.381 0.27 H22.6a0.4 0.4 ,0,0,1,0.4 0.4 V5.4a0.4 0.4 ,0,0,1-0.4 0.4 h-0.628a0.417 0.417 ,0,0,0-0.381 0.269 ZM20.2,5A1.2,1.2,0,1,0,19,6.2,1.2,1.2,0,0,0,20.2,5Z" />
 </vector>
diff --git a/devicesettings/res/mipmap-anydpi-v26/ic_launcher.xml b/devicesettings/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..67820c5
--- /dev/null
+++ b/devicesettings/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/devicesettings/res/mipmap-hdpi/ic_launcher.png b/devicesettings/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bc..0000000
Binary files a/devicesettings/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/devicesettings/res/mipmap-hdpi/ic_launcher_foreground.png b/devicesettings/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..fd839e0
Binary files /dev/null and b/devicesettings/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/devicesettings/res/mipmap-mdpi/ic_launcher.png b/devicesettings/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0c..0000000
Binary files a/devicesettings/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/devicesettings/res/mipmap-mdpi/ic_launcher_foreground.png b/devicesettings/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c26acd1
Binary files /dev/null and b/devicesettings/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/devicesettings/res/mipmap-tvdpi/ic_banner.png b/devicesettings/res/mipmap-tvdpi/ic_banner.png
new file mode 100644
index 0000000..920a43b
Binary files /dev/null and b/devicesettings/res/mipmap-tvdpi/ic_banner.png differ
diff --git a/devicesettings/res/mipmap-tvdpi/ic_launcher_foreground.png b/devicesettings/res/mipmap-tvdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..9b6c2fb
Binary files /dev/null and b/devicesettings/res/mipmap-tvdpi/ic_launcher_foreground.png differ
diff --git a/devicesettings/res/mipmap-xhdpi/ic_banner.png b/devicesettings/res/mipmap-xhdpi/ic_banner.png
new file mode 100644
index 0000000..60fa3c3
Binary files /dev/null and b/devicesettings/res/mipmap-xhdpi/ic_banner.png differ
diff --git a/devicesettings/res/mipmap-xhdpi/ic_launcher.png b/devicesettings/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0..0000000
Binary files a/devicesettings/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/devicesettings/res/mipmap-xhdpi/ic_launcher_foreground.png b/devicesettings/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c32e4ce
Binary files /dev/null and b/devicesettings/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/devicesettings/res/mipmap-xxhdpi/ic_launcher.png b/devicesettings/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72c..0000000
Binary files a/devicesettings/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/devicesettings/res/mipmap-xxhdpi/ic_launcher_foreground.png b/devicesettings/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..83a197c
Binary files /dev/null and b/devicesettings/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/devicesettings/res/mipmap-xxhdpi/ic_launcher_settings.png b/devicesettings/res/mipmap-xxhdpi/ic_launcher_settings.png
deleted file mode 100644
index 3fa69e9..0000000
Binary files a/devicesettings/res/mipmap-xxhdpi/ic_launcher_settings.png and /dev/null differ
diff --git a/devicesettings/res/mipmap-xxxhdpi/ic_launcher.png b/devicesettings/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e1..0000000
Binary files a/devicesettings/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/devicesettings/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/devicesettings/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..2cb032c
Binary files /dev/null and b/devicesettings/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/devicesettings/res/values/ic_launcher_background.xml b/devicesettings/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..5294395
--- /dev/null
+++ b/devicesettings/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#3E0E2F</color>
+</resources>
\ No newline at end of file
diff --git a/devicesettings/res/values/strings.xml b/devicesettings/res/values/strings.xml
index 5abf872..dd1afe7 100644
--- a/devicesettings/res/values/strings.xml
+++ b/devicesettings/res/values/strings.xml
@@ -15,8 +15,8 @@
      limitations under the License.
 -->
 <resources>
-    <string name="display_panel_title">Display and Performance Configuration</string>
-    <string name="display_panel_summary">Adjust display and performance settings</string>
+    <string name="display_panel_title">Switch Configuration</string>
+    <string name="display_panel_summary">Adjust docking, performance, and controller settings</string>
     <string name="perf_category_title">Customization</string>
     <string name="perf_setting_title">Performance Mode</string>
     <string name="perf_setting_summary">Modifies CPU and GPU clocks in order to get the best possible performance at the cost of higher battery wear and usage</string>
diff --git a/devicesettings/res/values/styles.xml b/devicesettings/res/values/styles.xml
index aec8fce..4654864 100644
--- a/devicesettings/res/values/styles.xml
+++ b/devicesettings/res/values/styles.xml
@@ -23,6 +23,9 @@
         <item name="preferenceStyle">@style/Theme.Main.PreferenceStyle</item>
         <item name="preferenceTheme">@style/Theme.Main.PreferenceTheme</item>
         <item name="switchPreferenceStyle">@style/Theme.Main.SwitchPreferenceStyle</item>
+        <item name="android:colorPrimary">#3E0E2F</item>
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
     </style>
 
     <style name="Theme.Main.DialogPreferenceStyle" parent="@*android:style/Preference.DeviceDefault.DialogPreference">