diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 00000000..a52dd424
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+java openjdk-23
diff --git a/README.md b/README.md
index 3b8361f5..9297e235 100755
--- a/README.md
+++ b/README.md
@@ -124,14 +124,14 @@ file ./mage/build/outputs/apk/mage-android-defaults-debug.apk
 
 With a device connected to your machine, you can install the MAGE app with the following command:
 ```bash
-./gradlew installDefaultsDebug
+./gradlew installDebug
 ```
 
 ### Test
 
 Run the tests on your device:
 ```bash
-./gradlew connectedDefaultsDebugAndroidTest
+./gradlew connectedDebugAndroidTest
 ```
 
 ## Pull Requests
diff --git a/gradle.properties b/gradle.properties
index 2ebb4a7f..f2c45c61 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,5 @@ org.gradle.jvmargs=-Xmx4096m
 
 # Application properties
 VERSION_CODE=1
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f01a4242..8006f2b7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu May 06 13:38:17 MDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/mage/build.gradle b/mage/build.gradle
index 02dc878b..067c1484 100644
--- a/mage/build.gradle
+++ b/mage/build.gradle
@@ -2,10 +2,10 @@ import org.ajoberstar.grgit.Grgit
 
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-android'
     id 'kotlin-parcelize'
     id 'kotlin-kapt'
-    id 'org.ajoberstar.grgit' version '4.1.0'
+    id 'org.ajoberstar.grgit' version '5.3.0'
     id 'com.google.dagger.hilt.android'
 }
 
@@ -33,7 +33,13 @@ def googleMapsApiReleaseKey = hasProperty('RELEASE_MAPS_API_KEY') ? RELEASE_MAPS
 def googleMapsApiDebugKey = hasProperty('DEBUG_MAPS_API_KEY') ? DEBUG_MAPS_API_KEY : ''
 
 android {
-    compileSdk 34
+    defaultConfig {
+        compileSdk 34
+    }
+
+    buildFeatures{
+        buildConfig = true
+    }
     namespace 'mil.nga.giat.mage'
 
     dataBinding {
@@ -57,6 +63,10 @@ android {
     kotlinOptions {
         jvmTarget = "21"
         freeCompilerArgs = ["-Xcontext-receivers"]
+        freeCompilerArgs += [
+                "-P",
+                "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=1.9.25"
+        ]
     }
 
     buildFeatures {
@@ -83,7 +93,7 @@ android {
         versionName project.version
         versionCode VERSION_CODE as int
         minSdkVersion 27
-        targetSdkVersion 33
+        targetSdkVersion 34
         multiDexEnabled true
         resValue "string", "serverURLDefaultValue", serverURL
         resValue "string", "recentMapXYZDefaultValue", "263.0,40.0,3"
diff --git a/mage/src/main/AndroidManifest.xml b/mage/src/main/AndroidManifest.xml
index e9e8e3f7..3b96ed17 100644
--- a/mage/src/main/AndroidManifest.xml
+++ b/mage/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
 
     <uses-feature
diff --git a/mage/src/main/java/mil/nga/giat/mage/data/repository/user/UserRepository.kt b/mage/src/main/java/mil/nga/giat/mage/data/repository/user/UserRepository.kt
index eb4f168f..a4870cca 100644
--- a/mage/src/main/java/mil/nga/giat/mage/data/repository/user/UserRepository.kt
+++ b/mage/src/main/java/mil/nga/giat/mage/data/repository/user/UserRepository.kt
@@ -14,17 +14,17 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import mil.nga.giat.mage.R
 import mil.nga.giat.mage.data.datasource.permission.RoleLocalDataSource
+import mil.nga.giat.mage.data.datasource.user.UserLocalDataSource
+import mil.nga.giat.mage.database.dao.MageSqliteOpenHelper
+import mil.nga.giat.mage.database.model.event.Event
+import mil.nga.giat.mage.database.model.user.User
 import mil.nga.giat.mage.di.TokenProvider
 import mil.nga.giat.mage.login.AuthenticationStatus
 import mil.nga.giat.mage.login.AuthorizationStatus
 import mil.nga.giat.mage.network.device.DeviceService
 import mil.nga.giat.mage.network.user.UserService
-import mil.nga.giat.mage.sdk.Compatibility.Companion.isCompatibleWith
-import mil.nga.giat.mage.database.model.event.Event
-import mil.nga.giat.mage.database.model.user.User
-import mil.nga.giat.mage.data.datasource.user.UserLocalDataSource
-import mil.nga.giat.mage.database.dao.MageSqliteOpenHelper
 import mil.nga.giat.mage.network.user.UserWithRoleTypeAdapter
+import mil.nga.giat.mage.sdk.Compatibility.Companion.isCompatibleWith
 import mil.nga.giat.mage.sdk.preferences.PreferenceHelper
 import mil.nga.giat.mage.sdk.utils.DeviceUuidFactory
 import mil.nga.giat.mage.sdk.utils.ISO8601DateFormatFactory
@@ -308,15 +308,20 @@ class UserRepository @Inject constructor(
    private suspend fun syncIcon(user: User) {
       val path = "${MediaUtility.getUserIconDirectory(application)}/${user.id}.png"
       val file = File(path)
-      if (file.exists()) {
+      /// At the moment, I can't see any code that regularly updates User.lastModified
+      /// Aside from the fact that we happen to pull users in their entirety every time we
+      /// do something... That should be fixed and then this code will be absolutely correct.
+      /// Until then, this code is achieving the result of not re-pulling an icon.
+      if (file.exists() && user.fetchedDate.before(user.lastModified)) {
          file.delete()
-      }
-
-      val response = userService.getIcon(user.remoteId)
-      val body = response.body()
-      if (response.isSuccessful && body != null) {
-         saveIcon(body, file)
-         compressIcon(file)
+         val response = userService.getIcon(user.remoteId)
+         val body = response.body()
+         if (response.isSuccessful && body != null) {
+            saveIcon(body, file)
+            compressIcon(file)
+            userLocalDataSource.setIconPath(user, path)
+         }
+      } else {
          userLocalDataSource.setIconPath(user, path)
       }
    }
diff --git a/mage/src/main/java/mil/nga/giat/mage/login/ServerUrlViewModel.kt b/mage/src/main/java/mil/nga/giat/mage/login/ServerUrlViewModel.kt
index 52931b3b..028d3c98 100644
--- a/mage/src/main/java/mil/nga/giat/mage/login/ServerUrlViewModel.kt
+++ b/mage/src/main/java/mil/nga/giat/mage/login/ServerUrlViewModel.kt
@@ -66,14 +66,22 @@ class ServerUrlViewModel @Inject constructor(
       if (Patterns.WEB_URL.matcher(url).matches()) {
          _urlState.value = UrlState.InProgress
 
+         var processedUrl:String = url
+         if (!processedUrl.contains("://")) {
+            processedUrl = "https://" + url
+         }
+         if (processedUrl.endsWith("/")) {
+            processedUrl = processedUrl.dropLast(1)
+         }
+
          viewModelScope.launch(Dispatchers.IO) {
-            when (val response = apiRepository.getApi(url)) {
+            when (val response = apiRepository.getApi(processedUrl)) {
                is ApiResponse.Success -> {
                   daoStore.resetDatabase()
                   database.destroy()
                   preferences
                      .edit()
-                     .putString(application.getString(R.string.serverURLKey), url)
+                     .putString(application.getString(R.string.serverURLKey), processedUrl)
                      .apply()
 
                   _urlState.postValue(UrlState.Valid)
diff --git a/mage/tests/AndroidManifest.xml b/mage/tests/AndroidManifest.xml
index d85a8ead..5f078b9d 100644
--- a/mage/tests/AndroidManifest.xml
+++ b/mage/tests/AndroidManifest.xml
@@ -8,7 +8,7 @@
 
     <uses-sdk
         android:minSdkVersion="16"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="34" />
 
     <instrumentation
         android:label="AndroidJUnitRunner"
diff --git a/settings.gradle b/settings.gradle
index b3b5213b..9ff9c96a 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,6 +6,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {