diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index f9bacf8fe..fed1569e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -86,7 +86,7 @@ public enum DeviceType {
     MISCALE2(131, R.drawable.ic_device_miscale2, R.drawable.ic_device_miscale2_disabled, R.string.devicetype_miscale2),
     BFH16(140, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_bfh16),
     MAKIBESHR3(150, R.drawable.ic_device_default, R.drawable.ic_device_hplus_disabled, R.string.devicetype_makibes_hr3),
-    BANGLEJS(160, R.drawable.ic_device_zetime, R.drawable.ic_device_zetime_disabled, R.string.devicetype_banglejs),
+    BANGLEJS(160, R.drawable.ic_device_banglejs, R.drawable.ic_device_banglejs_disabled, R.string.devicetype_banglejs),
     FOSSILQHYBRID(170, R.drawable.ic_device_zetime, R.drawable.ic_device_zetime_disabled, R.string.devicetype_qhybrid),
     TLW64(180, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_tlw64),
     PINETIME_JF(190, R.drawable.ic_device_pinetime, R.drawable.ic_device_pinetime_disabled, R.string.devicetype_pinetime_jf),
diff --git a/app/src/main/res/drawable/ic_device_banglejs.xml b/app/src/main/res/drawable/ic_device_banglejs.xml
new file mode 100644
index 000000000..ecf0646f2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_banglejs.xml
@@ -0,0 +1,34 @@
+<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="#1f7fdb"
+        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.6" />
+    <path
+        android:fillColor="#4dabf5"
+        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.6" />
+    <path
+        android:fillColor="#2196f3"
+        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.6" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.27 6.708h4.54a0.425 0.425 0 0 1 0.426 0.425v15.04a0.425 0.425 0 0 1-0.425 0.424h-4.542a0.425 0.425 0 0 1-0.425-0.425V7.132a0.425 0.425 0 0 1 0.425-0.424z"
+        android:strokeWidth="2.4" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.915 9.692h7.294a1.104 1.104 0 0 1 1.104 1.105v7.293a1.104 1.104 0 0 1-1.104 1.104h-7.294a1.104 1.104 0 0 1-1.104-1.104v-7.293a1.104 1.104 0 0 1 1.104-1.105z"
+        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="#2196f3"
+        android:pathData="M11.716 10.731h5.706a0.866 0.838 90 0 1 0.838 0.866v5.008a0.866 0.838 90 0 1-0.838 0.866h-5.707a0.866 0.838 90 0 1-0.837-0.866v-5.008a0.866 0.838 90 0 1 0.838-0.866z"
+        android:strokeWidth="5.1" />
+</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
new file mode 100644
index 000000000..d7a69c79d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_banglejs_disabled.xml
@@ -0,0 +1,35 @@
+<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/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 334f7a159..1635ce55f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -145,6 +145,8 @@
     <string name="connecting">In collegamento</string>
     <string name="connected">Connesso</string>
     <string name="_unknown_">(sconosciuto)</string>
+    <string name="pref_title_banglejs_settings">Impostazioni Bangle.js</string>
+    <string name="pref_header_banglejs_timeline">Timeline Bangle.js</string>
     <string name="test">Test</string>
     <string name="test_notification">Notifica di prova</string>
     <string name="this_is_a_test_notification_from_gadgetbridge">Notifica di prova creata da Gadgetbridge</string>
@@ -1295,4 +1297,4 @@
     <string name="reminder_time_once">%1$s, una volta sola</string>
     <string name="check_all_applications">Controlla tutte le applicazioni</string>
     <string name="prefs_reserve_reminder_calendar_summary">Numero di eventi del calendario che verranno sincronizzati</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7925834ea..d1d534520 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -277,8 +277,6 @@
     <string name="pref_title_pebble_enable_bgjs">Enable background JS</string>
     <string name="pref_summary_pebble_enable_bgjs">When enabled, allows watchfaces to show weather, battery info etc.</string>
     <string name="pref_title_pebble_reconnect_attempts">Reconnection attempts</string>
-    <string name="pref_title_banglejs_settings">Bangle.js settings</string>
-    <string name="pref_header_banglejs_agenda">Bangle.js agenda</string>
     <string name="pref_summary_expose_hr">Allows other apps to access HR data in realtime while Gadgetbridge is connected</string>
     <string name="pref_title_expose_hr">3rd party realtime HR access</string>
     <string name="pref_title_connected_advertisement">Visible while connected</string>
@@ -291,6 +289,8 @@
     <string name="pref_summary_device_internet_access">Allow apps on this device to access the internet</string>
     <string name="pref_title_device_intents">Allow Intents</string>
     <string name="pref_summary_device_intents">Allow Bangle.js watch apps to send Android Intents, and allow other apps on Android (like Tasker) to send data to Bangle.js with the com.banglejs.uart.tx Intent.</string>
+    <string name="pref_title_banglejs_settings">Bangle.js settings</string>
+    <string name="pref_header_banglejs_timeline">Bangle.js timeline</string>
     <string name="pref_summary_sync_calendar">Enables calendar alerts, even when disconnected</string>
     <string name="pref_title_sync_caldendar">Sync calendar events</string>
     <string name="pref_summary_relax_firmware_checks">Relax firmware checks</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index acccf5858..f21293707 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -295,10 +295,10 @@
             </PreferenceCategory>
         </PreferenceScreen>
         <PreferenceScreen
-            android:icon="@drawable/ic_device_pinetime"
+            android:icon="@drawable/ic_device_banglejs"
             android:key="pref_key_banglejs"
             android:title="@string/pref_title_banglejs_settings">
-            <PreferenceCategory android:title="@string/pref_header_banglejs_agenda">
+            <PreferenceCategory android:title="@string/pref_header_banglejs_timeline">
                 <CheckBoxPreference
             android:layout="@layout/preference_checkbox"
                     android:defaultValue="true"