diff --git a/build.gradle b/build.gradle
index eedd3851471b3a27cda9d78c828abf23c4acf593..9f3964e8e1a194e640b0aa6d94c5e471e92a5fde 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,7 +67,7 @@ dependencies {
     implementation "androidx.preference:preference:1.2.1"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.google.android.material:material:1.13.0-alpha12'
-    implementation 'androidx.work:work-runtime:2.9.1'
+    implementation 'androidx.work:work-runtime:2.10.0'
 
     implementation "androidx.emoji2:emoji2:1.5.0"
     freeImplementation "androidx.emoji2:emoji2-bundled:1.5.0"
@@ -96,7 +96,7 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-gson:2.11.0"
     implementation "com.squareup.okhttp3:okhttp:4.12.0"
 
-    implementation 'com.google.guava:guava:33.4.0-android'
+    implementation 'com.google.guava:guava:33.4.6-android'
     quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.13.52'
     implementation 'im.conversations.webrtc:webrtc-android:129.0.0'
 
@@ -112,11 +112,11 @@ ext {
 
 android {
     namespace 'eu.siacs.conversations'
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 42140
         versionName "2.18.1"
         archivesBaseName += "-$versionName"
diff --git a/src/conversations/res/layout/activity_easy_invite.xml b/src/conversations/res/layout/activity_easy_invite.xml
index 6f1c8fc57d386f4a45f4ef781dc37446ce61cd1f..3d1c20c36c09770a1d5bb003ef741271239295c1 100644
--- a/src/conversations/res/layout/activity_easy_invite.xml
+++ b/src/conversations/res/layout/activity_easy_invite.xml
@@ -5,6 +5,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/conversations/res/layout/activity_magic_create.xml b/src/conversations/res/layout/activity_magic_create.xml
index 923bd8113c35ae87605a87a25c0d485a54d9b527..33b548789fa8ca4b0db6913dd22f94e11d95005c 100644
--- a/src/conversations/res/layout/activity_magic_create.xml
+++ b/src/conversations/res/layout/activity_magic_create.xml
@@ -2,9 +2,9 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
-
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/conversations/res/layout/activity_pick_server.xml b/src/conversations/res/layout/activity_pick_server.xml
index 7d3c9a27ea3eee0770a3ce2f820dd959d047353e..862f20a132a44da3d96949bf31767935de771d77 100644
--- a/src/conversations/res/layout/activity_pick_server.xml
+++ b/src/conversations/res/layout/activity_pick_server.xml
@@ -2,9 +2,9 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
-
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/conversations/res/layout/activity_welcome.xml b/src/conversations/res/layout/activity_welcome.xml
index ee1c1a3d21aa8e423d479e7a07fe3a9c781e320d..aa71630fc089f0201bf3ea93a4a58b159c91af0a 100644
--- a/src/conversations/res/layout/activity_welcome.xml
+++ b/src/conversations/res/layout/activity_welcome.xml
@@ -4,6 +4,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/java/de/gultsch/common/MiniUri.java b/src/main/java/de/gultsch/common/MiniUri.java
index 6c5e123bb649e221de68e2b06e72c7b49d414726..79c78b549b496c67b0646122ddf08206fdba2e7e 100644
--- a/src/main/java/de/gultsch/common/MiniUri.java
+++ b/src/main/java/de/gultsch/common/MiniUri.java
@@ -1,6 +1,7 @@
 package de.gultsch.common;
 
 import android.net.Uri;
+import androidx.annotation.NonNull;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
@@ -11,7 +12,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class MiniUri {
 
diff --git a/src/main/java/de/gultsch/minidns/DNSServer.java b/src/main/java/de/gultsch/minidns/DNSServer.java
index 7486ec2c60c6a6601220b37bf19efbfc96f9e888..33d58c1eb0a1845da01b99f31e620f8f663fcb85 100644
--- a/src/main/java/de/gultsch/minidns/DNSServer.java
+++ b/src/main/java/de/gultsch/minidns/DNSServer.java
@@ -1,17 +1,15 @@
 package de.gultsch.minidns;
 
+import androidx.annotation.NonNull;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
-
 import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Nonnull;
-
 public final class DNSServer {
 
     public final InetAddress inetAddress;
@@ -76,7 +74,7 @@ public final class DNSServer {
     }
 
     @Override
-    @Nonnull
+    @NonNull
     public String toString() {
         return MoreObjects.toStringHelper(this)
                 .add("inetAddress", inetAddress)
diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
index 94c6b79b930877abca8f368e8815dd993258e958..ce9a80cd0f84ee080428d580a0d09c830282d6da 100644
--- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
@@ -1,20 +1,16 @@
 package eu.siacs.conversations.services;
 
-import android.content.Context;
+import static eu.siacs.conversations.entities.Transferable.VALID_CRYPTO_EXTENSIONS;
+
 import android.os.PowerManager;
 import android.os.SystemClock;
 import android.util.Log;
-
+import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.io.CipherInputStream;
-import org.bouncycastle.crypto.io.CipherOutputStream;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-
+import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.DownloadableFile;
+import eu.siacs.conversations.utils.Compatibility;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -22,20 +18,18 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.concurrent.atomic.AtomicLong;
-
-import javax.annotation.Nullable;
-
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.DownloadableFile;
-import eu.siacs.conversations.utils.Compatibility;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import okio.BufferedSink;
 import okio.Okio;
 import okio.Source;
-
-import static eu.siacs.conversations.entities.Transferable.VALID_CRYPTO_EXTENSIONS;
+import org.bouncycastle.crypto.engines.AESEngine;
+import org.bouncycastle.crypto.io.CipherInputStream;
+import org.bouncycastle.crypto.io.CipherOutputStream;
+import org.bouncycastle.crypto.modes.AEADBlockCipher;
+import org.bouncycastle.crypto.modes.GCMBlockCipher;
+import org.bouncycastle.crypto.params.AEADParameters;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 public class AbstractConnectionManager {
 
@@ -50,18 +44,19 @@ public class AbstractConnectionManager {
     public static InputStream upgrade(DownloadableFile file, InputStream is) {
         if (file.getKey() != null && file.getIv() != null) {
             AEADBlockCipher cipher = new GCMBlockCipher(new AESEngine());
-            cipher.init(true, new AEADParameters(new KeyParameter(file.getKey()), 128, file.getIv()));
+            cipher.init(
+                    true, new AEADParameters(new KeyParameter(file.getKey()), 128, file.getIv()));
             return new CipherInputStream(is, cipher);
         } else {
             return is;
         }
     }
 
+    // For progress tracking see:
+    // https://github.com/square/okhttp/blob/master/samples/guide/src/main/java/okhttp3/recipes/Progress.java
 
-    //For progress tracking see:
-    //https://github.com/square/okhttp/blob/master/samples/guide/src/main/java/okhttp3/recipes/Progress.java
-
-    public static RequestBody requestBody(final DownloadableFile file, final ProgressListener progressListener) {
+    public static RequestBody requestBody(
+            final DownloadableFile file, final ProgressListener progressListener) {
         return new RequestBody() {
 
             @Override
@@ -94,7 +89,8 @@ public class AbstractConnectionManager {
         void onProgress(long progress);
     }
 
-    public static OutputStream createOutputStream(DownloadableFile file, boolean append, boolean decrypt) {
+    public static OutputStream createOutputStream(
+            DownloadableFile file, boolean append, boolean decrypt) {
         FileOutputStream os;
         try {
             os = new FileOutputStream(file, append);
@@ -107,7 +103,8 @@ public class AbstractConnectionManager {
         }
         try {
             AEADBlockCipher cipher = new GCMBlockCipher(new AESEngine());
-            cipher.init(false, new AEADParameters(new KeyParameter(file.getKey()), 128, file.getIv()));
+            cipher.init(
+                    false, new AEADParameters(new KeyParameter(file.getKey()), 128, file.getIv()));
             return new CipherOutputStream(os, cipher);
         } catch (Exception e) {
             Log.d(Config.LOGTAG, "unable to create cipher output stream", e);
@@ -120,7 +117,9 @@ public class AbstractConnectionManager {
     }
 
     public long getAutoAcceptFileSize() {
-        final long autoAcceptFileSize = this.mXmppConnectionService.getLongPreference("auto_accept_file_size", R.integer.auto_accept_filesize);
+        final long autoAcceptFileSize =
+                this.mXmppConnectionService.getLongPreference(
+                        "auto_accept_file_size", R.integer.auto_accept_filesize);
         return autoAcceptFileSize <= 0 ? -1 : autoAcceptFileSize;
     }
 
@@ -130,7 +129,9 @@ public class AbstractConnectionManager {
 
     public void updateConversationUi(boolean force) {
         synchronized (LAST_UI_UPDATE_CALL) {
-            if (force || SystemClock.elapsedRealtime() - LAST_UI_UPDATE_CALL.get() >= UI_REFRESH_THRESHOLD) {
+            if (force
+                    || SystemClock.elapsedRealtime() - LAST_UI_UPDATE_CALL.get()
+                            >= UI_REFRESH_THRESHOLD) {
                 LAST_UI_UPDATE_CALL.set(SystemClock.elapsedRealtime());
                 mXmppConnectionService.updateConversationUi();
             }
@@ -138,7 +139,8 @@ public class AbstractConnectionManager {
     }
 
     public PowerManager.WakeLock createWakeLock(final String name) {
-        final PowerManager powerManager = ContextCompat.getSystemService(mXmppConnectionService, PowerManager.class);
+        final PowerManager powerManager =
+                ContextCompat.getSystemService(mXmppConnectionService, PowerManager.class);
         return powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, name);
     }
 
@@ -160,7 +162,7 @@ public class AbstractConnectionManager {
         }
 
         public static Extension of(String path) {
-            //TODO accept List<String> pathSegments
+            // TODO accept List<String> pathSegments
             final int pos = path.lastIndexOf('/');
             final String filename = path.substring(pos + 1).toLowerCase();
             final String[] parts = filename.split("\\.");
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index da5231357e42cd486e205158aceabdc0a817cebc..8601d88f58cc51ad3f5c27ec82f96241fb5f1c9d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -2,18 +2,15 @@ package eu.siacs.conversations.ui;
 
 import android.content.Intent;
 import android.os.Bundle;
-
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import eu.siacs.conversations.ui.util.SettingsUtils;
-
 public class ConversationActivity extends AppCompatActivity {
 
-	@Override
-	protected void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		startActivity(new Intent(this, ConversationsActivity.class));
-		finish();
-	}
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        startActivity(new Intent(this, ConversationsActivity.class));
+        finish();
+    }
 }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/Media.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/Media.java
index 6a41c89067e0d853f5b8db0d4a7a4140e6aab11b..4a491143e198f70cf47da3a6b501a9a973c4b955 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/Media.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/Media.java
@@ -1,18 +1,17 @@
 package eu.siacs.conversations.xmpp.jingle;
 
+import androidx.annotation.NonNull;
 import com.google.common.collect.ImmutableSet;
-
 import java.util.Locale;
 import java.util.Set;
 
-import javax.annotation.Nonnull;
-
 public enum Media {
-
-    VIDEO, AUDIO, UNKNOWN;
+    VIDEO,
+    AUDIO,
+    UNKNOWN;
 
     @Override
-    @Nonnull
+    @NonNull
     public String toString() {
         return super.toString().toLowerCase(Locale.ROOT);
     }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java
index e8079fe4663e71c482cd527345b987673ae33810..a7ee89cea1200acdfb710c03c6c32f1eebba3a8e 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java
@@ -1,5 +1,6 @@
 package eu.siacs.conversations.xmpp.jingle;
 
+import androidx.annotation.NonNull;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
@@ -25,7 +26,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nonnull;
 
 public class RtpContentMap extends AbstractContentMap<RtpDescription, IceUdpTransportInfo> {
 
@@ -491,7 +491,7 @@ public class RtpContentMap extends AbstractContentMap<RtpDescription, IceUdpTran
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public String toString() {
             return MoreObjects.toStringHelper(this)
                     .add("added", added)
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/TrackWrapper.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/TrackWrapper.java
index 16e89ca3b16c802ea25b4f97b505c3d277a8785e..f274357c09e8f7576056895035ade44880d1902b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/TrackWrapper.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/TrackWrapper.java
@@ -1,23 +1,18 @@
 package eu.siacs.conversations.xmpp.jingle;
 
 import android.util.Log;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-
 import eu.siacs.conversations.Config;
-
+import java.util.UUID;
 import org.webrtc.MediaStreamTrack;
 import org.webrtc.PeerConnection;
 import org.webrtc.RtpSender;
 import org.webrtc.RtpTransceiver;
 
-import java.util.UUID;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 class TrackWrapper<T extends MediaStreamTrack> {
     public final T track;
     public final RtpSender rtpSender;
@@ -63,7 +58,7 @@ class TrackWrapper<T extends MediaStreamTrack> {
     }
 
     public static <T extends MediaStreamTrack> RtpTransceiver getTransceiver(
-            @Nonnull final PeerConnection peerConnection, final TrackWrapper<T> trackWrapper) {
+            @NonNull final PeerConnection peerConnection, final TrackWrapper<T> trackWrapper) {
         final RtpSender rtpSender = trackWrapper.rtpSender;
         final String rtpSenderId;
         try {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/VideoSourceWrapper.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/VideoSourceWrapper.java
index 89552fc1814b1d9215ce6727268923d64182d67a..3a8a4cc6d7440acb92e244f4349aa0115e6eb83d 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/VideoSourceWrapper.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/VideoSourceWrapper.java
@@ -2,12 +2,15 @@ package eu.siacs.conversations.xmpp.jingle;
 
 import android.content.Context;
 import android.util.Log;
-
+import androidx.annotation.Nullable;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-
+import eu.siacs.conversations.Config;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Set;
 import org.webrtc.Camera2Enumerator;
 import org.webrtc.CameraEnumerationAndroid;
 import org.webrtc.CameraEnumerator;
@@ -17,14 +20,6 @@ import org.webrtc.PeerConnectionFactory;
 import org.webrtc.SurfaceTextureHelper;
 import org.webrtc.VideoSource;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import eu.siacs.conversations.Config;
-
 class VideoSourceWrapper {
 
     private static final int CAPTURING_RESOLUTION = 1920;
@@ -151,7 +146,7 @@ class VideoSourceWrapper {
                     return videoSourceWrapper;
                 }
             }
-            if (deviceNames.size() == 0) {
+            if (deviceNames.isEmpty()) {
                 return null;
             } else {
                 return of(enumerator, Iterables.get(deviceNames, 0), deviceNames);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java
index 09e95a7cd89e5d055e068fa48597aed5c700f03e..404461046576de1bc291601daa83353b276b0c9a 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java
@@ -3,6 +3,8 @@ package eu.siacs.conversations.xmpp.jingle;
 import android.content.Context;
 import android.os.Build;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -22,8 +24,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.webrtc.AudioSource;
 import org.webrtc.AudioTrack;
 import org.webrtc.CandidatePairChangeEvent;
@@ -661,7 +661,7 @@ public class WebRTCWrapper {
                 MoreExecutors.directExecutor());
     }
 
-    @Nonnull
+    @NonNull
     private ListenableFuture<PeerConnection> getPeerConnectionFuture() {
         final PeerConnection peerConnection = this.peerConnection;
         if (peerConnection == null) {
@@ -671,7 +671,7 @@ public class WebRTCWrapper {
         }
     }
 
-    @Nonnull
+    @NonNull
     private PeerConnection requirePeerConnection() {
         final PeerConnection peerConnection = this.peerConnection;
         if (peerConnection == null) {
@@ -680,7 +680,7 @@ public class WebRTCWrapper {
         return peerConnection;
     }
 
-    @Nonnull
+    @NonNull
     private PeerConnectionFactory requirePeerConnectionFactory() {
         final PeerConnectionFactory peerConnectionFactory = this.peerConnectionFactory;
         if (peerConnectionFactory == null) {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/transports/WebRTCDataChannelTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/transports/WebRTCDataChannelTransport.java
index 80b0322f4727cf418d7f37de58d9cb6feb1ddbf6..2540d6027daf5aa336b1e2e998b3ea8be877fd7e 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/transports/WebRTCDataChannelTransport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/transports/WebRTCDataChannelTransport.java
@@ -5,6 +5,7 @@ import static eu.siacs.conversations.xmpp.jingle.WebRTCWrapper.logDescription;
 
 import android.content.Context;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Closeables;
@@ -41,7 +42,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
 import org.webrtc.CandidatePairChangeEvent;
 import org.webrtc.DataChannel;
 import org.webrtc.IceCandidate;
@@ -437,7 +437,7 @@ public class WebRTCDataChannelTransport implements Transport {
                 localDescriptionExecutorService);
     }
 
-    @Nonnull
+    @NonNull
     private PeerConnectionFactory requirePeerConnectionFactory() {
         final PeerConnectionFactory peerConnectionFactory = this.peerConnectionFactory;
         if (peerConnectionFactory == null) {
@@ -446,7 +446,7 @@ public class WebRTCDataChannelTransport implements Transport {
         return peerConnectionFactory;
     }
 
-    @Nonnull
+    @NonNull
     private PeerConnection requirePeerConnection() {
         final var future = this.peerConnectionFuture;
         if (future != null && future.isDone()) {
diff --git a/src/main/res/layout-w945dp/activity_conversations.xml b/src/main/res/layout-w945dp/activity_conversations.xml
index 6e0b978c49d3b8bce75fc246b027c7e066a9eed6..bece0533efd9ffbcedd1df7248ae1ebf80708def 100644
--- a/src/main/res/layout-w945dp/activity_conversations.xml
+++ b/src/main/res/layout-w945dp/activity_conversations.xml
@@ -3,6 +3,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_add_reaction.xml b/src/main/res/layout/activity_add_reaction.xml
index 0a963b02c6b2385a3de0369be310100dbea25b8c..4a3ca0e564d82f025049bb5ad96058a28ba4e96f 100644
--- a/src/main/res/layout/activity_add_reaction.xml
+++ b/src/main/res/layout/activity_add_reaction.xml
@@ -3,6 +3,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
@@ -20,6 +21,6 @@
         <androidx.emoji2.emojipicker.EmojiPickerView
             android:id="@+id/emoji_picker"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent" />
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index b5c9b2162747be61d5a42d51977d24258c86bacf..abcac84a06d6511fba9e81228692e878749807ad 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -4,7 +4,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
diff --git a/src/main/res/layout/activity_channel_discovery.xml b/src/main/res/layout/activity_channel_discovery.xml
index a41888cdc1fc1f4d7abcce1ed2765c4882ee322d..f255d9b7e1f319736db66352c8f461490f5c1459 100644
--- a/src/main/res/layout/activity_channel_discovery.xml
+++ b/src/main/res/layout/activity_channel_discovery.xml
@@ -6,6 +6,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml
index fd3a891df1a6764123d0bd5addeec6ba126703ce..87b4108c96756e9aafc916f1db68288b944f4989 100644
--- a/src/main/res/layout/activity_choose_contact.xml
+++ b/src/main/res/layout/activity_choose_contact.xml
@@ -4,6 +4,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index d7eb087d2b6aaf66be3a082b1cfae113850d0ab5..b4687b8c245f6a846a520ecc60405e19b49559cb 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -6,6 +6,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_conversations.xml b/src/main/res/layout/activity_conversations.xml
index e05d29ca1d1ea81dcbfdc758050cc7c7242537d9..792689c96464e806ee874c4053a254a178873e9e 100644
--- a/src/main/res/layout/activity_conversations.xml
+++ b/src/main/res/layout/activity_conversations.xml
@@ -4,6 +4,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 98df185f4f0dfda27ace0a8b67c61d0e2ba9f598..f6aff8a4dade446a93df31912b3a47156c656e79 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -5,7 +5,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
diff --git a/src/main/res/layout/activity_import_backup.xml b/src/main/res/layout/activity_import_backup.xml
index 7e7c9efc47ee39c3c39e7d6982905ac89fd467be..d3f97621c8545d4d6dfe48fcb0a19bebe5178935 100644
--- a/src/main/res/layout/activity_import_backup.xml
+++ b/src/main/res/layout/activity_import_backup.xml
@@ -5,6 +5,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_manage_accounts.xml b/src/main/res/layout/activity_manage_accounts.xml
index 15e5d35d9422c9abcbf137bfb07c80996f5b7d42..9ab9fc8c74860abcc24dadbf03ada58040157ddb 100644
--- a/src/main/res/layout/activity_manage_accounts.xml
+++ b/src/main/res/layout/activity_manage_accounts.xml
@@ -4,6 +4,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_media_browser.xml b/src/main/res/layout/activity_media_browser.xml
index 8975af5c0f738b6cf3272d562199c9ffdf43baf2..88dbde91c8a075f5168731bfc3a3c45251dbef79 100644
--- a/src/main/res/layout/activity_media_browser.xml
+++ b/src/main/res/layout/activity_media_browser.xml
@@ -4,6 +4,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
 
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 0af16d1bd3bb61d522be191a62c8614efd37c709..30f6bf9401f1df9cd16a4b40e21277730599b9e9 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -6,6 +6,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_muc_users.xml b/src/main/res/layout/activity_muc_users.xml
index f581a1c1a0b041cecdec224398ee6c44c03d5f84..ee1013740fb58ac6d9fe6ea22b49d9af27802211 100644
--- a/src/main/res/layout/activity_muc_users.xml
+++ b/src/main/res/layout/activity_muc_users.xml
@@ -5,6 +5,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 6516e432ce4a9ddd1c3e87f1d124da04a2dea662..bdf2807bffaa1deaba404ac7e2c6d19b9b3ec91d 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -4,7 +4,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index cd3ec1ceffa87bda73f4b2dba7757a21d46304bb..c4863d6dd2b60a0bbd1cb60be3d213d1b668047a 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -5,7 +5,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <LinearLayout
             android:id="@+id/pip_placeholder"
diff --git a/src/main/res/layout/activity_search.xml b/src/main/res/layout/activity_search.xml
index d2612d728ab9b5164ed5c3ce9e8920af9a5c30d7..8e185527ed39a4724d5b43cae7aeaaaf8e0265b2 100644
--- a/src/main/res/layout/activity_search.xml
+++ b/src/main/res/layout/activity_search.xml
@@ -5,6 +5,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
@@ -20,10 +21,10 @@
         </com.google.android.material.appbar.AppBarLayout>
 
         <ListView
-            android:background="@drawable/background_search"
             android:id="@+id/search_results"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="@drawable/background_search"
             android:divider="@android:color/transparent"
             android:dividerHeight="0dp"
             android:listSelector="@android:color/transparent"
diff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xml
index 53d84da4fbb799d07cfca0916de96014181ff36b..170d979a34be1c7b71b85366304c5f86842e574d 100644
--- a/src/main/res/layout/activity_settings.xml
+++ b/src/main/res/layout/activity_settings.xml
@@ -4,7 +4,8 @@
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
diff --git a/src/main/res/layout/activity_share_location.xml b/src/main/res/layout/activity_share_location.xml
index 7f925aa352a9797e5752bf49e02443efc222db0a..14a69a7899a7d742912f38aef253cf18a4b123a7 100644
--- a/src/main/res/layout/activity_share_location.xml
+++ b/src/main/res/layout/activity_share_location.xml
@@ -5,6 +5,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         tools:context=".ui.ShareLocationActivity">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_share_with.xml b/src/main/res/layout/activity_share_with.xml
index 993b84ff503ab9d03384541243d7c6c186048abe..427f772db5b3392dbdb65bedd2944706f72c9fc8 100644
--- a/src/main/res/layout/activity_share_with.xml
+++ b/src/main/res/layout/activity_share_with.xml
@@ -5,6 +5,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/main/res/layout/activity_show_location.xml b/src/main/res/layout/activity_show_location.xml
index 84f72ab2299d7f81c3521d2d3838a4787f266c8b..83c2812a35147d0f519311e0892d0054a8731638 100644
--- a/src/main/res/layout/activity_show_location.xml
+++ b/src/main/res/layout/activity_show_location.xml
@@ -3,7 +3,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index 7659c90188adaf860985afc89fde9f49fb1a29cd..555c09bdf13160bb4f003767a831bcd4acf463d3 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -4,7 +4,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
@@ -51,9 +52,9 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:contentDescription="@string/add_contact_or_create_or_join_group_chat"
-            app:sdMainFabClosedSrc="@drawable/ic_add_24dp"
             app:sdMainFabClosedBackgroundColor="?colorPrimaryContainer"
             app:sdMainFabClosedIconColor="?colorOnPrimaryContainer"
+            app:sdMainFabClosedSrc="@drawable/ic_add_24dp"
             app:sdMainFabOpenedBackgroundColor="?colorPrimaryContainer"
             app:sdMainFabOpenedIconColor="?colorOnPrimaryContainer"
             app:sdOverlayLayout="@id/overlay"
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 701ea5438932f1454c3f64cec3fd2f4ca0748e1c..f9c4229ffe2b370c3b39e05b32a5cae755da5d3d 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -3,7 +3,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 0ab08a041d072b5c39182c77cc07a62a9e33a1dc..4981bb52225da001b0eabb065391e1e53ef855b2 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -14,6 +14,7 @@
     <style name="Theme.Conversations3.SplashScreen" parent="@style/Theme.Conversations3">
         <item name="android:windowBackground">@drawable/background_splash_screen</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowFullscreen">true</item>
     </style>
 
     <style name="Theme.Conversations3.Dialog" parent="@style/Theme.Conversations3">
diff --git a/src/quicksy/res/layout/activity_choose_country.xml b/src/quicksy/res/layout/activity_choose_country.xml
index 13dc3de7cd0c4ac334ebf203223ee3e3a9c0f994..b9e3056ebdee12f54b2c8e7efcc9a63a26b099b3 100644
--- a/src/quicksy/res/layout/activity_choose_country.xml
+++ b/src/quicksy/res/layout/activity_choose_country.xml
@@ -4,6 +4,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
 
diff --git a/src/quicksy/res/layout/activity_enter_name.xml b/src/quicksy/res/layout/activity_enter_name.xml
index 4a8a5649a69e8a09ccb4d162209df1dc9ea286c1..836ce2b25cc101a7097a42fc07703bb4379fe1c0 100644
--- a/src/quicksy/res/layout/activity_enter_name.xml
+++ b/src/quicksy/res/layout/activity_enter_name.xml
@@ -4,6 +4,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
 
diff --git a/src/quicksy/res/layout/activity_enter_number.xml b/src/quicksy/res/layout/activity_enter_number.xml
index 63ea37c1b603ada9a11d1a88db6f6529a889c7e1..4963eab13a51470a2c236956b428712c1afcffc1 100644
--- a/src/quicksy/res/layout/activity_enter_number.xml
+++ b/src/quicksy/res/layout/activity_enter_number.xml
@@ -5,6 +5,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/quicksy/res/layout/activity_tos.xml b/src/quicksy/res/layout/activity_tos.xml
index ff58b068d2acb80141403ff425afd8fa1542fa58..90d7fb633ef44b966b6330a442cda85588a093b8 100644
--- a/src/quicksy/res/layout/activity_tos.xml
+++ b/src/quicksy/res/layout/activity_tos.xml
@@ -4,6 +4,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
diff --git a/src/quicksy/res/layout/activity_verify.xml b/src/quicksy/res/layout/activity_verify.xml
index aadf3e0f0ea79e4c6e523cff86ece0891b8c2eca..f244a8d53c15b627cae6483dae61542fd881cd38 100644
--- a/src/quicksy/res/layout/activity_verify.xml
+++ b/src/quicksy/res/layout/activity_verify.xml
@@ -4,6 +4,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout