diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fdcac1eb..bec667ded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ### Changelog
 
+### 0.63.0
+* Galaxy Buds Live: Initial Support
+* Sony WH-1000XM3: Initial Support
+* Add Nekogram X to Telegram notifications
+* Move location settings out of pebble menu
+* Nothing Ear (1): add multiple batteries support
+* Galaxy Buds: add multiple batteries support
+
 ### 0.62.0
 * Iniital support for Galaxy Buds 2019
 * Huami: Fix syncing of data in non-DST time
diff --git a/app/src/main/assets/ic_galaxy_buds_live_l.svg b/app/src/main/assets/ic_galaxy_buds_live_l.svg
index b3111e17c..1114bb3c2 100644
--- a/app/src/main/assets/ic_galaxy_buds_live_l.svg
+++ b/app/src/main/assets/ic_galaxy_buds_live_l.svg
@@ -27,9 +27,9 @@
      fit-margin-right="3"
      fit-margin-bottom="2"
      fit-margin-top="2"
-     inkscape:zoom="3.5931104"
-     inkscape:cx="61.645754"
-     inkscape:cy="88.363553"
+     inkscape:zoom="4.3195774"
+     inkscape:cx="13.311487"
+     inkscape:cy="62.390362"
      inkscape:window-width="1920"
      inkscape:window-height="1035"
      inkscape:window-x="0"
@@ -47,7 +47,7 @@
        aria-label="L"
        id="text23582"
        style="font-size:7.05556px;line-height:124%;font-family:Sans;-inkscape-font-specification:Sans;letter-spacing:0px;word-spacing:0px;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none"
-       transform="translate(3.1750001)">
+       transform="translate(3.1921316,-0.30467255)">
       <path
          d="M 6.9078682,5.6385593 H 7.6037779 V 10.196424 H 10.108364 V 10.78209 H 6.9078682 Z"
          id="path24331"
@@ -55,7 +55,7 @@
     </g>
     <path
        style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 13.759733,16.879157 C 12.243462,18.198095 10.165144,18.605728 8.5607702,17.898861 6.8552237,17.147416 5.6809733,15.355298 5.6598064,13.471467 5.6474977,12.375547 5.90529,11.584112 6.6235628,10.512742 7.238773,9.5951004 7.3883019,9.1436171 7.3656495,8.2721049 7.3462147,7.5244825 7.1584435,7.053719 6.5234473,6.1606497 5.9196433,5.3114487 5.6665018,4.6925171 5.5593556,3.8034444 5.3658597,2.1978512 5.9835328,0.64465448 7.272401,-0.50416378 c 1.629404,-1.45235032 4.046946,-1.46364722 5.99242,-0.028004 2.256246,1.66497608 3.601416,4.86286788 3.659915,8.70076008 0.03572,2.3434217 -0.379816,4.4146917 -1.229998,6.1310447 -0.326227,0.658582 -0.56079,1.030886 -1.0088,1.601185 -0.41003,0.521954 -0.449618,0.563769 -0.926193,0.978342 z"
+       d="M 13.383555,16.454104 C 11.867284,17.773042 9.788966,18.180675 8.1845922,17.473808 6.4790457,16.722363 5.3047953,14.930245 5.2836284,13.046414 5.2713197,11.950494 5.529112,11.159059 6.2473848,10.087689 6.862595,9.1700478 7.0121239,8.7185645 6.9894715,7.8470523 6.9700367,7.0994299 6.7822655,6.6286664 6.1472693,5.7355971 5.5434653,4.8863961 5.2903238,4.2674645 5.1831776,3.3783918 4.9896817,1.7727986 5.6073548,0.21960185 6.896223,-0.92921641 c 1.629404,-1.45235029 4.046946,-1.46364719 5.99242,-0.028004 2.256246,1.66497608 3.601416,4.86286791 3.659915,8.70076011 0.03572,2.3434213 -0.379816,4.4146913 -1.229998,6.1310443 -0.326227,0.658582 -0.56079,1.030886 -1.0088,1.601185 -0.41003,0.521954 -0.449618,0.563769 -0.926193,0.978342 z"
        id="path11168" />
   </g>
   <g
diff --git a/app/src/main/assets/ic_galaxy_buds_live_r.svg b/app/src/main/assets/ic_galaxy_buds_live_r.svg
index 4f5a90a5e..0e59629b2 100644
--- a/app/src/main/assets/ic_galaxy_buds_live_r.svg
+++ b/app/src/main/assets/ic_galaxy_buds_live_r.svg
@@ -27,9 +27,9 @@
      fit-margin-top="2"
      fit-margin-right="3"
      fit-margin-bottom="2"
-     inkscape:zoom="5.0814254"
-     inkscape:cx="60.514516"
-     inkscape:cy="38.276662"
+     inkscape:zoom="6.1088053"
+     inkscape:cx="37.077626"
+     inkscape:cy="50.009779"
      inkscape:window-width="1920"
      inkscape:window-height="1035"
      inkscape:window-x="0"
@@ -47,7 +47,7 @@
        aria-label="R"
        id="text20823"
        style="font-size:7.05556px;line-height:124%;font-family:Sans;-inkscape-font-specification:Sans;letter-spacing:0px;word-spacing:0px;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none"
-       transform="translate(2.6458334)">
+       transform="translate(2.5829786,-0.5449331)">
       <path
          d="m 9.0560585,10.458658 q 0.2239314,0.07579 0.4340823,0.32384 0.2135961,0.248047 0.4271921,0.682129 l 0.7062451,1.4056 H 9.8759918 L 9.2179781,11.550754 Q 8.9630409,11.03399 8.721884,10.86518 8.4841723,10.69637 8.0707606,10.69637 H 7.3128391 v 2.173857 H 6.6169293 V 7.726696 h 1.5709646 q 0.881945,0 1.3160273,0.3686254 0.4340823,0.3686255 0.4340823,1.1127666 0,0.4857588 -0.2273764,0.806153 -0.2239314,0.320394 -0.6545686,0.444417 z M 7.3128391,8.2985822 v 1.8259018 h 0.8750548 q 0.5029843,0 0.7579215,-0.2308216 0.2583823,-0.2342666 0.2583823,-0.6855744 0,-0.4513078 -0.2583823,-0.6786843 Q 8.6908782,8.2985822 8.1878939,8.2985822 Z"
          id="path21707"
@@ -55,7 +55,7 @@
     </g>
     <path
        style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 8.7628379,18.727033 c 1.5162551,1.318938 3.5945541,1.726571 5.1989131,1.019704 1.705531,-0.751445 2.87977,-2.543563 2.900937,-4.427394 0.01231,-1.09592 -0.245482,-1.887355 -0.963748,-2.958725 -0.615204,-0.917642 -0.764732,-1.369125 -0.742079,-2.240638 0.01943,-0.747622 0.207204,-1.2183855 0.842194,-2.1114548 0.603798,-0.849201 0.856937,-1.4681326 0.964083,-2.3572053 C 17.156632,4.0457267 16.538964,2.49253 15.250108,1.3437118 13.620719,-0.10863865 11.2032,-0.11993555 9.2577446,1.3157078 7.0015198,2.9806838 5.6563628,6.1785756 5.5978644,10.016468 c -0.03572,2.343422 0.3798124,4.414692 1.2299864,6.131045 0.326224,0.658582 0.5607847,1.030886 1.0087907,1.601185 0.4100257,0.521954 0.4496137,0.563769 0.9261844,0.978342 z"
+       d="m 8.9163768,18.30198 c 1.5162552,1.318938 3.5945542,1.726571 5.1989132,1.019704 1.705531,-0.751445 2.87977,-2.543563 2.900937,-4.427394 0.01231,-1.09592 -0.245482,-1.887355 -0.963748,-2.958725 C 15.437275,11.017923 15.287747,10.56644 15.3104,9.6949274 15.32983,8.9473054 15.517604,8.4765419 16.152594,7.5834726 16.756392,6.7342716 17.009531,6.11534 17.116677,5.2262673 17.310171,3.6206741 16.692503,2.0674774 15.403647,0.91865918 13.774258,-0.53369127 11.356739,-0.54498817 9.4112835,0.89065518 7.1550587,2.5556312 5.8099017,5.753523 5.7514033,9.5914154 c -0.03572,2.3434216 0.3798124,4.4146916 1.2299864,6.1310446 0.326224,0.658582 0.5607847,1.030886 1.0087907,1.601185 0.4100257,0.521954 0.4496137,0.563769 0.9261844,0.978342 z"
        id="path11168" />
   </g>
 </svg>
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java
index 1e2000217..aaa2a2a4b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java
@@ -37,8 +37,8 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
     private static final byte SOMPlus = (byte) 0xFD;
     private static final byte EOMPlus = (byte) 0xDD;
 
-    private static byte SOM = SOMBuds;
-    private static byte EOM = EOMBuds;
+    private byte SOM = SOMBuds;
+    private byte EOM = EOMBuds;
 
     private boolean isFirstExchange = true;
 
@@ -322,9 +322,7 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
 
     protected GalaxyBudsProtocol(GBDevice device) {
         super(device);
-        LOG.debug("PETR, " + device.getType());
         if (device.getType().equals(DeviceType.GALAXY_BUDS_LIVE)) {
-            LOG.debug("set som");
             SOM = SOMPlus;
             EOM = EOMPlus;
         }
diff --git a/app/src/main/res/drawable/ic_galaxy_buds_live_l.xml b/app/src/main/res/drawable/ic_galaxy_buds_live_l.xml
index 71d5b87ee..388a6f57e 100644
--- a/app/src/main/res/drawable/ic_galaxy_buds_live_l.xml
+++ b/app/src/main/res/drawable/ic_galaxy_buds_live_l.xml
@@ -1,16 +1,16 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
     android:tint="#7E7E7E"
-    android:viewportHeight="23.999998">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M11.233 9.733h0.696v4.558h2.504v0.585h-3.2z"
+        android:pathData="M11.25 9.428h0.696v4.558h2.505v0.586H11.25z"
         android:strokeWidth="0.5"
         android:strokeColor="#000000" />
     <path
-        android:pathData="M14.91 20.974c-1.517 1.318-3.595 1.726-5.2 1.02-1.705-0.752-2.879-2.544-2.9-4.428-0.012-1.096 0.245-1.887 0.964-2.959 0.615-0.918 0.764-1.369 0.742-2.24-0.02-0.748-0.208-1.219-0.843-2.112C7.07 9.405 6.816 8.787 6.71 7.898 6.516 6.292 7.134 4.739 8.422 3.59c1.63-1.452 4.047-1.463 5.993-0.028 2.256 1.665 3.601 4.863 3.66 8.701 0.035 2.343-0.38 4.415-1.23 6.131-0.326 0.659-0.561 1.03-1.01 1.601-0.41 0.522-0.449 0.564-0.925 0.978z"
+        android:pathData="M14.534 20.549c-1.517 1.318-3.595 1.726-5.2 1.02-1.705-0.752-2.88-2.544-2.9-4.428-0.013-1.096 0.245-1.888 0.963-2.959 0.616-0.918 0.765-1.37 0.742-2.24-0.019-0.748-0.207-1.219-0.842-2.112C6.694 8.98 6.44 8.362 6.333 7.473 6.14 5.867 6.757 4.313 8.046 3.165c1.63-1.452 4.047-1.464 5.993-0.028 2.256 1.665 3.601 4.863 3.66 8.7 0.035 2.344-0.38 4.416-1.23 6.132-0.327 0.658-0.561 1.03-1.01 1.601-0.41 0.522-0.449 0.564-0.926 0.978z"
         android:strokeWidth="2"
         android:strokeColor="#000000" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_galaxy_buds_live_r.xml b/app/src/main/res/drawable/ic_galaxy_buds_live_r.xml
index 13bedc195..aa4255049 100644
--- a/app/src/main/res/drawable/ic_galaxy_buds_live_r.xml
+++ b/app/src/main/res/drawable/ic_galaxy_buds_live_r.xml
@@ -2,15 +2,15 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="23.999998"
+    android:viewportWidth="24"
     android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12.252 12.705q0.224 0.076 0.434 0.324 0.214 0.248 0.427 0.682l0.707 1.406h-0.748l-0.658-1.32q-0.255-0.517-0.496-0.685-0.238-0.17-0.651-0.17h-0.758v2.175H9.813V9.973h1.57q0.883 0 1.317 0.369 0.434 0.368 0.434 1.113 0 0.485-0.227 0.806-0.224 0.32-0.655 0.444zm-1.743-2.16v1.826h0.875q0.503 0 0.758-0.23 0.258-0.235 0.258-0.686 0-0.452-0.258-0.68-0.255-0.23-0.758-0.23z"
+        android:pathData="M12.19 12.16q0.223 0.076 0.433 0.324 0.214 0.248 0.427 0.682l0.707 1.406h-0.748l-0.658-1.32q-0.255-0.517-0.496-0.685-0.238-0.17-0.651-0.17h-0.758v2.175H9.75V9.428h1.571q0.882 0 1.316 0.369 0.434 0.368 0.434 1.113 0 0.485-0.227 0.806-0.224 0.32-0.655 0.444zM10.445 10v1.826h0.875q0.503 0 0.758-0.23 0.258-0.235 0.258-0.686 0-0.452-0.258-0.68Q11.824 10 11.32 10z"
         android:strokeWidth="0.5"
         android:strokeColor="#000000" />
     <path
-        android:pathData="M9.313 20.974c1.516 1.318 3.595 1.726 5.199 1.02 1.705-0.752 2.88-2.544 2.9-4.428 0.013-1.096-0.245-1.888-0.963-2.959-0.615-0.917-0.765-1.369-0.742-2.24 0.02-0.748 0.207-1.219 0.842-2.112 0.604-0.85 0.857-1.468 0.964-2.357 0.194-1.606-0.424-3.159-1.713-4.308-1.63-1.452-4.047-1.463-5.992-0.028-2.256 1.665-3.601 4.863-3.66 8.7-0.036 2.344 0.38 4.416 1.23 6.132 0.326 0.659 0.56 1.03 1.009 1.601 0.41 0.522 0.45 0.564 0.926 0.978z"
+        android:pathData="M9.466 20.549c1.517 1.318 3.595 1.726 5.2 1.02 1.705-0.752 2.88-2.544 2.9-4.428 0.013-1.096-0.245-1.888-0.963-2.959-0.616-0.918-0.765-1.37-0.743-2.24 0.02-0.748 0.208-1.219 0.843-2.112 0.604-0.85 0.857-1.468 0.964-2.357 0.193-1.606-0.424-3.16-1.713-4.308-1.63-1.452-4.047-1.464-5.993-0.028C7.705 4.802 6.36 8 6.301 11.837c-0.035 2.344 0.38 4.416 1.23 6.132 0.327 0.658 0.561 1.03 1.01 1.601 0.41 0.522 0.449 0.564 0.925 0.978z"
         android:strokeWidth="2"
         android:strokeColor="#000000" />
 </vector>