diff --git a/android/build.gradle b/android/build.gradle
index 38f4de2ac..ef733ee45 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -102,9 +102,9 @@ android {
 
     defaultConfig {
         applicationId "com.thebluealliance.androidclient"
-        compileSdk 34
+        compileSdk 35
         minSdkVersion 19
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode versionNum
         versionName version.toString()
         multiDexEnabled true
@@ -230,9 +230,9 @@ dependencies {
     implementation project(':libImgur')
 
     // Android support libraries
-    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation("androidx.activity:activity:1.9.3")
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.core:core:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.multidex:multidex:2.0.1'
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index c2b19a377..91e9050c4 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -100,7 +100,7 @@
         <activity
             android:name=".activities.HomeActivity"
             android:launchMode="singleTop"
-            android:theme="@style/AppThemeNoActionBarTranslucentStatus" />
+            android:theme="@style/AppThemeNoActionBar" />
         <activity
             android:name=".activities.settings.MyTBAModelSettingsActivity"
             android:theme="@style/AppThemeNoActionBarTranslucentLightStatus" />
@@ -108,7 +108,7 @@
             android:name=".activities.ViewEventActivity"
             android:launchMode="singleTop"
             android:parentActivityName=".activities.HomeActivity"
-            android:theme="@style/AppThemeNoActionBarTranslucentStatus">
+            android:theme="@style/AppThemeNoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.thebluealliance.androidclient.activities.HomeActivity" />
@@ -117,7 +117,7 @@
             android:name=".activities.ViewTeamActivity"
             android:launchMode="standard"
             android:parentActivityName=".activities.HomeActivity"
-            android:theme="@style/AppThemeNoActionBarTranslucentStatus">
+            android:theme="@style/AppThemeNoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.thebluealliance.androidclient.activities.HomeActivity" />
@@ -126,7 +126,7 @@
             android:name=".activities.ViewMatchActivity"
             android:launchMode="standard"
             android:parentActivityName=".activities.ViewEventActivity"
-            android:theme="@style/AppThemeNoActionBarTranslucentStatus">
+            android:theme="@style/AppThemeNoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.thebluealliance.androidclient.activities.ViewEventActivity" />
@@ -134,7 +134,7 @@
         <activity
             android:name=".activities.ViewDistrictActivity"
             android:parentActivityName=".activities.HomeActivity"
-            android:theme="@style/AppThemeNoActionBarTranslucentStatus">
+            android:theme="@style/AppThemeNoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.thebluealliance.androidclient.activities.HomeActivity" />
@@ -142,24 +142,26 @@
         <activity
             android:name=".activities.TeamAtDistrictActivity"
             android:parentActivityName=".activities.ViewDistrictActivity"
-            android:theme="@style/AppThemeNoActionBarTranslucentStatus">
+            android:theme="@style/AppThemeNoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.thebluealliance.androidclient.activities.ViewDistrictActivity" />
         </activity>
         <activity
             android:name=".activities.settings.SettingsActivity"
-            android:label="@string/title_activity_settings" />
+            android:label="@string/title_activity_settings"
+          android:theme="@style/AppThemeNoActionBar"  />
         <activity
             android:name=".activities.OpenSourceLicensesActivity"
-            android:label="@string/license_label" />
+            android:label="@string/license_label"
+            android:theme="@style/AppThemeNoActionBar" />
         <activity
             android:name=".activities.ContributorsActivity"
             android:theme="@style/AppThemeNoActionBar" />
         <activity
             android:name=".activities.TeamAtEventActivity"
             android:parentActivityName=".activities.ViewEventActivity"
-            android:theme="@style/AppThemeNoActionBarTranslucentStatus">
+            android:theme="@style/AppThemeNoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.thebluealliance.androidclient.activities.ViewEventActivity" />
@@ -167,7 +169,7 @@
         <activity
             android:name=".activities.SearchResultsActivity"
             android:launchMode="singleTop"
-            android:theme="@style/AppThemeNoActionBarTranslucentStatus"
+            android:theme="@style/AppThemeNoActionBar"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
@@ -188,6 +190,7 @@
         <activity
             android:name=".activities.settings.DevSettingsActivity"
             android:label="@string/title_activity_dev_settings"
+            android:theme="@style/AppThemeNoActionBar"
             android:parentActivityName=".activities.settings.SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -196,6 +199,7 @@
         <activity
             android:name=".activities.settings.NotificationSettingsActivity"
             android:label="@string/notification_settings"
+            android:theme="@style/AppThemeNoActionBar"
             android:parentActivityName=".activities.settings.SettingsActivity"
             android:exported="true">
             <meta-data
diff --git a/android/src/main/java/com/thebluealliance/androidclient/Utilities.java b/android/src/main/java/com/thebluealliance/androidclient/Utilities.java
index b039cbcec..e7485a6bf 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/Utilities.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/Utilities.java
@@ -23,9 +23,12 @@
 import android.view.View;
 import android.view.Window;
 
+import androidx.activity.EdgeToEdge;
 import androidx.annotation.RawRes;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.view.WindowInsetsControllerCompat;
 
 import com.google.common.base.Predicate;
 import com.thebluealliance.androidclient.activities.HomeActivity;
@@ -482,4 +485,12 @@ public static int getCurrentDarkModePreference(String prefValue) {
                 return MODE_NIGHT_UNSPECIFIED;
         }
     }
+
+    public static void configureActivityForEdgeToEdge(AppCompatActivity activity) {
+        EdgeToEdge.enable(activity);
+
+        Window window = activity.getWindow();
+        WindowInsetsControllerCompat insetsController = new WindowInsetsControllerCompat(window, window.getDecorView());
+        insetsController.setAppearanceLightStatusBars(false);
+    }
 }
\ No newline at end of file
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/ConfirmImageSuggestionActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/ConfirmImageSuggestionActivity.java
index f140e603b..6b5087e04 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/ConfirmImageSuggestionActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/ConfirmImageSuggestionActivity.java
@@ -10,11 +10,9 @@
 import android.view.ViewTreeObserver;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.view.ViewCompat;
-
 import com.thebluealliance.androidclient.R;
 import com.thebluealliance.androidclient.TbaLogger;
+import com.thebluealliance.androidclient.Utilities;
 import com.thebluealliance.androidclient.databinding.ActivityConfirmImageSuggestionBinding;
 import com.thebluealliance.androidclient.helpers.TeamHelper;
 import com.thebluealliance.androidclient.imgur.ImgurSuggestionService;
@@ -26,6 +24,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import androidx.appcompat.app.AppCompatActivity;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -59,6 +58,7 @@ public static Intent newIntent(Context context, Uri imageUri, String teamKey, in
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Utilities.configureActivityForEdgeToEdge(this);
 
         mBinding = ActivityConfirmImageSuggestionBinding.inflate(getLayoutInflater());
         setContentView(mBinding.getRoot());
@@ -69,7 +69,6 @@ protected void onCreate(Bundle savedInstanceState) {
         // Disable the "confirm" FAB until we have a valid file to submit
         mBinding.confirmFab.setEnabled(false);
 
-        ViewCompat.setElevation(mBinding.toolbar, getResources().getDimension(R.dimen.toolbar_elevation));
         setSupportActionBar(mBinding.toolbar);
         // TODO don't use hardcoded string
         getSupportActionBar().setTitle("Confirm suggestion");
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/MoreSearchResultsActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/MoreSearchResultsActivity.java
index 7d86117b4..f7a56806b 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/MoreSearchResultsActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/MoreSearchResultsActivity.java
@@ -10,7 +10,6 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.ViewCompat;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 
@@ -55,10 +54,10 @@ public static Intent newInstance(Context c, int mode, String query) {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Utilities.configureActivityForEdgeToEdge(this);
         setContentView(R.layout.activity_search_results);
 
         toolbar = (Toolbar) findViewById(R.id.toolbar);
-        ViewCompat.setElevation(toolbar, getResources().getDimension(R.dimen.toolbar_elevation));
         setSupportActionBar(toolbar);
 
         /* Report activity start to Analytics */
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/MyTBAOnboardingActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/MyTBAOnboardingActivity.java
index cfd4c1235..1b9594f6a 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/MyTBAOnboardingActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/MyTBAOnboardingActivity.java
@@ -10,6 +10,7 @@
 import androidx.viewpager.widget.ViewPager;
 
 import com.thebluealliance.androidclient.R;
+import com.thebluealliance.androidclient.Utilities;
 import com.thebluealliance.androidclient.databinding.ActivityMytbaOnboardingBinding;
 import com.thebluealliance.androidclient.mytba.MyTbaOnboardingController;
 import com.thebluealliance.androidclient.views.MyTBAOnboardingViewPager;
@@ -36,6 +37,7 @@ public class MyTBAOnboardingActivity extends AppCompatActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Utilities.configureActivityForEdgeToEdge(this);
         mBinding = ActivityMytbaOnboardingBinding.inflate(getLayoutInflater());
         setContentView(mBinding.getRoot());
 
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/MyTBASettingsActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/MyTBASettingsActivity.java
index cd4fe78cd..8617f741d 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/MyTBASettingsActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/MyTBASettingsActivity.java
@@ -432,6 +432,7 @@ protected void syncFabVisibilityWithMyTbaEnabled(boolean animate) {
         } else {
             hideFab(animate);
         }
+        showFab(animate);
     }
 
     protected void showFab(boolean animate) {
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/NavigationDrawerActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/NavigationDrawerActivity.java
index 9876a0adf..845dd0cd0 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/NavigationDrawerActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/NavigationDrawerActivity.java
@@ -11,6 +11,7 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 
 import com.thebluealliance.androidclient.R;
+import com.thebluealliance.androidclient.Utilities;
 import com.thebluealliance.androidclient.activities.settings.SettingsActivity;
 import com.thebluealliance.androidclient.fragments.NavigationDrawerFragment;
 import com.thebluealliance.androidclient.listitems.NavDrawerItem;
@@ -66,9 +67,11 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.setContentView(R.layout.activity_navigation_drawer);
 
+        Utilities.configureActivityForEdgeToEdge(this);
+
         mDrawerLayout = (DrawerLayout) findViewById(R.id.nav_drawer_layout);
         mContentView = (FrameLayout) findViewById(R.id.content);
-        mDrawerLayout.setStatusBarBackground(R.color.primary_dark);
+        mDrawerLayout.setStatusBarBackground(R.color.primary);
         mDrawerContainer = (ScrimInsetsFrameLayout) findViewById(R.id.navigation_drawer_fragment_container);
 
         handler = new Handler();
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/OnboardingActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/OnboardingActivity.java
index 92240bc51..37819ff9d 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/OnboardingActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/OnboardingActivity.java
@@ -12,14 +12,11 @@
 import android.view.View;
 import android.view.WindowManager;
 
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.thebluealliance.androidclient.BuildConfig;
 import com.thebluealliance.androidclient.Constants;
 import com.thebluealliance.androidclient.R;
 import com.thebluealliance.androidclient.TbaLogger;
+import com.thebluealliance.androidclient.Utilities;
 import com.thebluealliance.androidclient.adapters.FirstLaunchPagerAdapter;
 import com.thebluealliance.androidclient.background.firstlaunch.LoadTBADataWorker;
 import com.thebluealliance.androidclient.databinding.ActivityOnboardingBinding;
@@ -34,6 +31,9 @@
 
 import javax.inject.Inject;
 
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import dagger.hilt.android.AndroidEntryPoint;
 
 @AndroidEntryPoint
@@ -65,6 +65,7 @@ public class OnboardingActivity extends AppCompatActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Utilities.configureActivityForEdgeToEdge(this);
         mBinding = ActivityOnboardingBinding.inflate(getLayoutInflater());
         setContentView(mBinding.getRoot());
 
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/OpenSourceLicensesActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/OpenSourceLicensesActivity.java
index 1620ecf82..ffbad3d12 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/OpenSourceLicensesActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/OpenSourceLicensesActivity.java
@@ -3,11 +3,12 @@
 import android.os.Bundle;
 import android.text.Html;
 import android.view.MenuItem;
-import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.thebluealliance.androidclient.R;
+import com.thebluealliance.androidclient.Utilities;
+import com.thebluealliance.androidclient.databinding.ActivityOpenSourceLicensesBinding;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -16,9 +17,14 @@ public class OpenSourceLicensesActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_open_source_licenses);
-        TextView text = (TextView) findViewById(R.id.text);
+        Utilities.configureActivityForEdgeToEdge(this);
+
+        ActivityOpenSourceLicensesBinding binding = ActivityOpenSourceLicensesBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        setSupportActionBar(binding.toolbar);
         setupActionBar();
+
         try {
             BufferedReader br = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.licenses)));
             try {
@@ -31,13 +37,13 @@ protected void onCreate(Bundle savedInstanceState) {
                     line = br.readLine();
                 }
                 String everything = sb.toString();
-                text.setText(Html.fromHtml(everything));
+                binding.text.setText(Html.fromHtml(everything));
             } finally {
                 br.close();
             }
         } catch (Exception e) {
             e.printStackTrace();
-            text.setText("Error reading licenses file.");
+            binding.text.setText("Error reading licenses file.");
         }
     }
 
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/RedownloadActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/RedownloadActivity.java
index 146c34de6..0af7d300b 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/RedownloadActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/RedownloadActivity.java
@@ -19,6 +19,7 @@
 import com.thebluealliance.androidclient.Constants;
 import com.thebluealliance.androidclient.R;
 import com.thebluealliance.androidclient.TbaLogger;
+import com.thebluealliance.androidclient.Utilities;
 import com.thebluealliance.androidclient.adapters.FirstLaunchPagerAdapter;
 import com.thebluealliance.androidclient.background.firstlaunch.LoadTBADataWorker;
 import com.thebluealliance.androidclient.databinding.ActivityRedownloadBinding;
@@ -55,6 +56,7 @@ public class RedownloadActivity extends AppCompatActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Utilities.configureActivityForEdgeToEdge(this);
         mBinding = ActivityRedownloadBinding.inflate(getLayoutInflater());
         setContentView(mBinding.getRoot());
 
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/UpdateRequiredActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/UpdateRequiredActivity.java
index bd4f25958..5fd9dc8b4 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/UpdateRequiredActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/UpdateRequiredActivity.java
@@ -7,12 +7,15 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.thebluealliance.androidclient.R;
+import com.thebluealliance.androidclient.Utilities;
 
 public class UpdateRequiredActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Utilities.configureActivityForEdgeToEdge(this);
+
         setContentView(R.layout.activity_update_required);
 
         findViewById(R.id.update_google_play_button).setOnClickListener(v -> {
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/settings/DevSettingsActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/settings/DevSettingsActivity.java
index ef26be028..e4f33acbd 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/settings/DevSettingsActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/settings/DevSettingsActivity.java
@@ -15,10 +15,12 @@
 import com.thebluealliance.androidclient.Analytics;
 import com.thebluealliance.androidclient.R;
 import com.thebluealliance.androidclient.TbaLogger;
+import com.thebluealliance.androidclient.Utilities;
 import com.thebluealliance.androidclient.activities.RedownloadActivity;
 import com.thebluealliance.androidclient.auth.firebase.MigrateLegacyUserToFirebase;
 import com.thebluealliance.androidclient.background.firstlaunch.LoadTBADataWorker;
 import com.thebluealliance.androidclient.config.AppConfig;
+import com.thebluealliance.androidclient.databinding.ActivitySettingsBinding;
 import com.thebluealliance.androidclient.datafeed.status.StatusRefreshService;
 import com.thebluealliance.androidclient.mytba.MyTbaRegistrationWorker;
 import com.thebluealliance.androidclient.mytba.MyTbaUpdateWorker;
@@ -35,6 +37,11 @@ public class DevSettingsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Utilities.configureActivityForEdgeToEdge(this);
+
+        ActivitySettingsBinding binding = ActivitySettingsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -42,7 +49,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         getSupportFragmentManager()
                 .beginTransaction()
-                .replace(android.R.id.content, new DevSettingsFragment())
+                .replace(R.id.content, new DevSettingsFragment())
                 .commit();
     }
 
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/settings/NotificationSettingsActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/settings/NotificationSettingsActivity.java
index 84cfbcbce..09c70125f 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/settings/NotificationSettingsActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/settings/NotificationSettingsActivity.java
@@ -16,12 +16,19 @@
 import androidx.preference.SwitchPreference;
 
 import com.thebluealliance.androidclient.R;
+import com.thebluealliance.androidclient.Utilities;
+import com.thebluealliance.androidclient.databinding.ActivitySettingsBinding;
 
 public class NotificationSettingsActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Utilities.configureActivityForEdgeToEdge(this);
+
+        ActivitySettingsBinding binding = ActivitySettingsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
 
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -29,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (existingFragment == null || !existingFragment.getClass().equals(NotificationSettingsFragment.class)) {
             // Display the fragment as the main content.
             getSupportFragmentManager().beginTransaction()
-                    .replace(android.R.id.content, new NotificationSettingsFragment())
+                    .replace(R.id.content, new NotificationSettingsFragment())
                     .commit();
         }
     }
diff --git a/android/src/main/java/com/thebluealliance/androidclient/activities/settings/SettingsActivity.java b/android/src/main/java/com/thebluealliance/androidclient/activities/settings/SettingsActivity.java
index 3db3b85cf..25e334445 100644
--- a/android/src/main/java/com/thebluealliance/androidclient/activities/settings/SettingsActivity.java
+++ b/android/src/main/java/com/thebluealliance/androidclient/activities/settings/SettingsActivity.java
@@ -25,6 +25,7 @@
 import com.thebluealliance.androidclient.activities.ContributorsActivity;
 import com.thebluealliance.androidclient.activities.MyTBAOnboardingActivity;
 import com.thebluealliance.androidclient.activities.OpenSourceLicensesActivity;
+import com.thebluealliance.androidclient.databinding.ActivitySettingsBinding;
 
 import javax.inject.Inject;
 
@@ -36,6 +37,11 @@ public class SettingsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Utilities.configureActivityForEdgeToEdge(this);
+
+        ActivitySettingsBinding binding = ActivitySettingsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
 
         @Nullable ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -43,7 +49,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         getSupportFragmentManager()
                 .beginTransaction()
-                .replace(android.R.id.content, new SettingsFragment())
+                .replace(R.id.content, new SettingsFragment())
                 .commit();
     }
 
diff --git a/android/src/main/res/layout/activity_confirm_image_suggestion.xml b/android/src/main/res/layout/activity_confirm_image_suggestion.xml
index 8a41ba414..5c691ffc3 100644
--- a/android/src/main/res/layout/activity_confirm_image_suggestion.xml
+++ b/android/src/main/res/layout/activity_confirm_image_suggestion.xml
@@ -6,9 +6,17 @@
     android:layout_height="match_parent"
     android:background="@color/dark_theme_background">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/DefaultToolbarStyle" />
+
+    <com.google.android.material.appbar.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:fitsSystemWindows="true">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/DefaultToolbarStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/android/src/main/res/layout/activity_mytba_model_settings.xml b/android/src/main/res/layout/activity_mytba_model_settings.xml
index a8b439540..2936734bb 100644
--- a/android/src/main/res/layout/activity_mytba_model_settings.xml
+++ b/android/src/main/res/layout/activity_mytba_model_settings.xml
@@ -8,13 +8,20 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            style="@style/DefaultLightToolbarStyleWithContentInset"
-            android:background="@color/accent"
-            app:contentInsetStart="72dp"
-            app:navigationContentDescription="@string/close"
-            app:navigationIcon="@drawable/ic_close_black_24dp" />
+        <com.google.android.material.appbar.AppBarLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:background="@color/accent"
+          android:fitsSystemWindows="true">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/DefaultLightToolbarStyleWithContentInset"
+                app:contentInsetStart="72dp"
+                app:navigationContentDescription="@string/close"
+                app:navigationIcon="@drawable/ic_close_black_24dp" />
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <FrameLayout
             android:id="@+id/settings_list"
diff --git a/android/src/main/res/layout/activity_mytba_onboarding.xml b/android/src/main/res/layout/activity_mytba_onboarding.xml
index 5d77c331d..3560827e6 100644
--- a/android/src/main/res/layout/activity_mytba_onboarding.xml
+++ b/android/src/main/res/layout/activity_mytba_onboarding.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:background="@color/primary">
 
     <com.thebluealliance.androidclient.views.MyTBAOnboardingViewPager
diff --git a/android/src/main/res/layout/activity_onboarding.xml b/android/src/main/res/layout/activity_onboarding.xml
index 4d09b6fbd..9cf0b79a2 100644
--- a/android/src/main/res/layout/activity_onboarding.xml
+++ b/android/src/main/res/layout/activity_onboarding.xml
@@ -7,6 +7,7 @@
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:background="@color/primary">
 
         <RelativeLayout
diff --git a/android/src/main/res/layout/activity_open_source_licenses.xml b/android/src/main/res/layout/activity_open_source_licenses.xml
index 5fb9f3bee..8cf8a4bf9 100644
--- a/android/src/main/res/layout/activity_open_source_licenses.xml
+++ b/android/src/main/res/layout/activity_open_source_licenses.xml
@@ -1,13 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:textSize="16sp" />
-</ScrollView>
\ No newline at end of file
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:fitsSystemWindows="true">
+
+        <androidx.appcompat.widget.Toolbar
+          android:id="@+id/toolbar"
+          style="@style/DefaultToolbarStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ScrollView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:textSize="16sp" />
+
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/android/src/main/res/layout/activity_redownload.xml b/android/src/main/res/layout/activity_redownload.xml
index 78ca47e95..b614f991a 100644
--- a/android/src/main/res/layout/activity_redownload.xml
+++ b/android/src/main/res/layout/activity_redownload.xml
@@ -7,6 +7,7 @@
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:background="@color/primary">
 
         <RelativeLayout
diff --git a/android/src/main/res/layout/activity_search_results.xml b/android/src/main/res/layout/activity_search_results.xml
index fad5affc7..d8a175cd9 100644
--- a/android/src/main/res/layout/activity_search_results.xml
+++ b/android/src/main/res/layout/activity_search_results.xml
@@ -5,9 +5,16 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/DefaultToolbarStyleWithContentInset" />
+    <com.google.android.material.appbar.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:fitsSystemWindows="true">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/DefaultToolbarStyleWithContentInset" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ListView
         android:id="@+id/results"
diff --git a/android/src/main/res/layout/activity_settings.xml b/android/src/main/res/layout/activity_settings.xml
new file mode 100644
index 000000000..28f170d06
--- /dev/null
+++ b/android/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:fitsSystemWindows="true">
+
+        <androidx.appcompat.widget.Toolbar
+          android:id="@+id/toolbar"
+          style="@style/DefaultToolbarStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.fragment.app.FragmentContainerView
+      android:id="@+id/content"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/android/src/main/res/layout/activity_update_required.xml b/android/src/main/res/layout/activity_update_required.xml
index f3be727db..38a0fd285 100644
--- a/android/src/main/res/layout/activity_update_required.xml
+++ b/android/src/main/res/layout/activity_update_required.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:background="@color/primary">
 
     <TextView
diff --git a/android/src/main/res/values-v21/styles.xml b/android/src/main/res/values-v21/styles.xml
index 935281f6c..58ac63836 100644
--- a/android/src/main/res/values-v21/styles.xml
+++ b/android/src/main/res/values-v21/styles.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppThemeNoActionBarTranslucentStatus" parent="AppThemeNoActionBar">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-
     <!-- on API >= 21, this will use the borderless seelectable background -->
     <style name="SnackbarActionStyle">
         <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
diff --git a/build.gradle b/build.gradle
index e4649e010..476af131e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,7 +55,7 @@ allprojects {
         rxAndroidVersion = '1.2.1'
         gsonVersion = '2.10.1'
         daggerVersion = '2.50'
-        robolectricVersion = '4.11.1'
+        robolectricVersion = '4.14.1'
         permissionDispatcherVersion = '4.9.2'
         workManagerVersion = '2.9.0'