diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 7ba46d97f5..9146524c81 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -29,7 +29,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Bundle;
-import android.util.Log;
+import org.thoughtcrime.securesms.logging.Log;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
index 56ebe21501..165aa05fef 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import androidx.annotation.NonNull;
-import android.util.Log;
+import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
index 07da933adf..bc7e6e0502 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.api
 
 import android.media.MediaDataSource
 import android.os.Build
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import androidx.annotation.RequiresApi
 import org.greenrobot.eventbus.EventBus
 import org.thoughtcrime.securesms.attachments.Attachment
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt
index 2332ae9c0f..0028599523 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.api
 
 import android.content.Context
 import android.os.Handler
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import androidx.annotation.WorkerThread
 import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.functional.bind
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
index c5442a6ed0..61f7b82985 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.database
 
 import android.content.ContentValues
 import android.content.Context
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.loki.utilities.*
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
index 374b65aaf3..d05f9e2931 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.database
 import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
index e17fc30c34..0bd88f35fb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.protocol
 
 import android.content.Context
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import com.google.protobuf.ByteString
 import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.deferred
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
index fc764c53ae..cf582640f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.protocol
 
 import android.content.Context
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.crypto.PreKeyUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceProtocol.kt
index e7ae156643..0c04921135 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceProtocol.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.protocol.shelved
 
 import android.content.Context
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import nl.komponents.kovenant.Promise
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/SyncMessagesProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/SyncMessagesProtocol.kt
index 675905321f..5c687cb76b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/SyncMessagesProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/SyncMessagesProtocol.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.protocol.shelved
 
 import android.content.Context
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import androidx.annotation.WorkerThread
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
index 55e367b1b9..399f6c20fd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import com.opencsv.CSVReader
 import org.session.libsignal.service.loki.api.onionrequests.OnionRequestAPI
 import java.io.File
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PromiseUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PromiseUtilities.kt
index 75188abb89..23b21585d2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PromiseUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PromiseUtilities.kt
@@ -1,7 +1,7 @@
 @file:JvmName("PromiseUtilities")
 package org.thoughtcrime.securesms.loki.utilities
 
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.deferred
 import java.util.concurrent.TimeoutException
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
index 77f6d69312..7eb204d8f3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
@@ -7,7 +7,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Environment
 import android.provider.DocumentsContract
-import android.util.Log
+import org.thoughtcrime.securesms.logging.Log
 import android.widget.Toast
 import androidx.annotation.WorkerThread
 import androidx.documentfile.provider.DocumentFile
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RealtimeSleepTimer.java b/app/src/main/java/org/thoughtcrime/securesms/util/RealtimeSleepTimer.java
index 6a18d90b76..f990969953 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RealtimeSleepTimer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RealtimeSleepTimer.java
@@ -8,7 +8,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
 import android.os.SystemClock;
-import android.util.Log;
+import org.thoughtcrime.securesms.logging.Log;
 
 import org.session.libsignal.service.api.util.SleepTimer;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
index b9e6f6c169..54b6aa19e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.view.ContextThemeWrapper;
 
-import android.util.Log;
+import org.thoughtcrime.securesms.logging.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;