diff --git a/lib/pages/communities_tab.dart b/lib/pages/communities_tab.dart
index b157245..66c7826 100644
--- a/lib/pages/communities_tab.dart
+++ b/lib/pages/communities_tab.dart
@@ -93,7 +93,7 @@ class CommunitiesTab extends HookWidget {
       return Scaffold(
         appBar: AppBar(),
         body: const Center(
-          child: CircularProgressIndicator(),
+          child: CircularProgressIndicator.adaptive(),
         ),
       );
     }
@@ -277,7 +277,9 @@ class _CommunitySubscribeToggle extends HookWidget {
               ),
         child: delayed.loading
             ? const SizedBox(
-                width: 20, height: 20, child: CircularProgressIndicator())
+                width: 20,
+                height: 20,
+                child: CircularProgressIndicator.adaptive())
             : Icon(
                 subbed.value ? Icons.done : Icons.add,
                 color: subbed.value
diff --git a/lib/pages/community.dart b/lib/pages/community.dart
index fe32a73..0ab381f 100644
--- a/lib/pages/community.dart
+++ b/lib/pages/community.dart
@@ -96,7 +96,8 @@ class CommunityPage extends HookWidget {
                   child: Text('ERROR: ${fullCommunitySnap.error}'),
                 )
               ] else
-                const CircularProgressIndicator(semanticsLabel: 'loading')
+                const CircularProgressIndicator.adaptive(
+                    semanticsLabel: 'loading')
             ],
           ),
         ),
@@ -505,7 +506,7 @@ class _FollowButton extends HookWidget {
                   child: SizedBox(
                     height: 15,
                     width: 15,
-                    child: CircularProgressIndicator(),
+                    child: CircularProgressIndicator.adaptive(),
                   ),
                 )
               : ElevatedButton.icon(
diff --git a/lib/pages/create_post.dart b/lib/pages/create_post.dart
index 8b7a1e8..b6cb9f2 100644
--- a/lib/pages/create_post.dart
+++ b/lib/pages/create_post.dart
@@ -170,7 +170,7 @@ class CreatePostPage extends HookWidget {
           return const [
             DropdownMenuItem(
               value: -1,
-              child: CircularProgressIndicator(),
+              child: CircularProgressIndicator.adaptive(),
             )
           ];
         }
@@ -262,7 +262,7 @@ class CreatePostPage extends HookWidget {
       const SizedBox(width: 5),
       IconButton(
         icon: imageUploadLoading.value
-            ? const CircularProgressIndicator()
+            ? const CircularProgressIndicator.adaptive()
             : Icon(pictrsDeleteToken.value == null
                 ? Icons.add_photo_alternate
                 : Icons.close),
@@ -335,7 +335,7 @@ class CreatePostPage extends HookWidget {
                   onPressed:
                       delayed.pending ? () {} : loggedInAction(handleSubmit),
                   child: delayed.loading
-                      ? const CircularProgressIndicator()
+                      ? const CircularProgressIndicator.adaptive()
                       : Text(_isEdit
                           ? L10n.of(context)!.edit
                           : L10n.of(context)!.post),
diff --git a/lib/pages/instance.dart b/lib/pages/instance.dart
index b87d739..0b98016 100644
--- a/lib/pages/instance.dart
+++ b/lib/pages/instance.dart
@@ -58,7 +58,8 @@ class InstancePage extends HookWidget {
               ] else if (siteSnap.hasData && siteSnap.data!.siteView == null)
                 const Text('ERROR')
               else
-                const CircularProgressIndicator(semanticsLabel: 'loading')
+                const CircularProgressIndicator.adaptive(
+                    semanticsLabel: 'loading')
             ],
           ),
         ),
@@ -325,7 +326,7 @@ class _AboutTab extends HookWidget {
             else
               const Padding(
                 padding: EdgeInsets.symmetric(vertical: 10),
-                child: CircularProgressIndicator(),
+                child: CircularProgressIndicator.adaptive(),
               ),
             ListTile(
               title: const Center(child: Text('See all')),
diff --git a/lib/pages/manage_account.dart b/lib/pages/manage_account.dart
index 9febc3a..fe884a6 100644
--- a/lib/pages/manage_account.dart
+++ b/lib/pages/manage_account.dart
@@ -77,7 +77,7 @@ class ManageAccountPage extends HookWidget {
             return Center(child: Text('Error: ${userSnap.error?.toString()}'));
           }
           if (!userSnap.hasData) {
-            return const Center(child: CircularProgressIndicator());
+            return const Center(child: CircularProgressIndicator.adaptive());
           }
 
           return _ManageAccount(user: userSnap.data!);
@@ -367,7 +367,7 @@ class _ManageAccount extends HookWidget {
               ? const SizedBox(
                   width: 20,
                   height: 20,
-                  child: CircularProgressIndicator(),
+                  child: CircularProgressIndicator.adaptive(),
                 )
               : Text(L10n.of(context)!.save),
         ),
@@ -490,7 +490,7 @@ class _ImagePicker extends HookWidget {
                     ? const SizedBox(
                         height: 20,
                         width: 20,
-                        child: CircularProgressIndicator())
+                        child: CircularProgressIndicator.adaptive())
                     : Row(
                         children: const [Text('upload'), Icon(Icons.publish)],
                       ),
diff --git a/lib/pages/media_view.dart b/lib/pages/media_view.dart
index b735112..8e3dd0c 100644
--- a/lib/pages/media_view.dart
+++ b/lib/pages/media_view.dart
@@ -147,7 +147,7 @@ class MediaViewPage extends HookWidget {
             imageProvider: ExtendedNetworkImageProvider(url, cache: true),
             heroAttributes: PhotoViewHeroAttributes(tag: url),
             loadingBuilder: (context, event) =>
-                const Center(child: CircularProgressIndicator()),
+                const Center(child: CircularProgressIndicator.adaptive()),
           ),
         ),
       ),
diff --git a/lib/pages/modlog_page.dart b/lib/pages/modlog_page.dart
index 49f044c..c364632 100644
--- a/lib/pages/modlog_page.dart
+++ b/lib/pages/modlog_page.dart
@@ -56,7 +56,8 @@ class ModlogPage extends HookWidget {
                   future: modlogFut,
                   builder: (context, snapshot) {
                     if (!snapshot.hasData) {
-                      return const Center(child: CircularProgressIndicator());
+                      return const Center(
+                          child: CircularProgressIndicator.adaptive());
                     } else if (snapshot.hasError) {
                       return Center(
                           child: Text('Error: ${snapshot.error?.toString()}'));
diff --git a/lib/pages/settings/add_account.dart b/lib/pages/settings/add_account.dart
index 40c78c0..799b930 100644
--- a/lib/pages/settings/add_account.dart
+++ b/lib/pages/settings/add_account.dart
@@ -157,7 +157,7 @@ class AddAccountPage extends HookWidget {
                   : SizedBox(
                       width: 20,
                       height: 20,
-                      child: CircularProgressIndicator(
+                      child: CircularProgressIndicator.adaptive(
                         valueColor:
                             AlwaysStoppedAnimation<Color>(theme.canvasColor),
                       ),
diff --git a/lib/pages/settings/add_instance.dart b/lib/pages/settings/add_instance.dart
index c2b0a04..ffe9de3 100644
--- a/lib/pages/settings/add_instance.dart
+++ b/lib/pages/settings/add_instance.dart
@@ -120,7 +120,7 @@ class AddInstancePage extends HookWidget {
                     : SizedBox(
                         height: 20,
                         width: 20,
-                        child: CircularProgressIndicator(
+                        child: CircularProgressIndicator.adaptive(
                           valueColor:
                               AlwaysStoppedAnimation<Color>(theme.canvasColor),
                         ),
diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart
index 321bf9e..a87c84d 100644
--- a/lib/pages/settings/settings.dart
+++ b/lib/pages/settings/settings.dart
@@ -240,7 +240,7 @@ class _AccountOptions extends HookWidget {
                 ? const SizedBox(
                     height: 25,
                     width: 25,
-                    child: CircularProgressIndicator(),
+                    child: CircularProgressIndicator.adaptive(),
                   )
                 : const Icon(Icons.cloud_download),
             title: const Text('Import settings to lemmur'),
diff --git a/lib/pages/user.dart b/lib/pages/user.dart
index f2c03eb..327eb5a 100644
--- a/lib/pages/user.dart
+++ b/lib/pages/user.dart
@@ -32,7 +32,7 @@ class UserPage extends HookWidget {
       } else if (userDetailsSnap.hasError) {
         return const Center(child: Text('Could not find that user.'));
       } else {
-        return const Center(child: CircularProgressIndicator());
+        return const Center(child: CircularProgressIndicator.adaptive());
       }
     }();
 
diff --git a/lib/pages/write_message.dart b/lib/pages/write_message.dart
index d6a8bd6..9e033c3 100644
--- a/lib/pages/write_message.dart
+++ b/lib/pages/write_message.dart
@@ -124,7 +124,7 @@ class WriteMessagePage extends HookWidget {
                     ? const SizedBox(
                         height: 20,
                         width: 20,
-                        child: CircularProgressIndicator())
+                        child: CircularProgressIndicator.adaptive())
                     : Text(submit),
               ),
             ),
diff --git a/lib/widgets/comment/comment.dart b/lib/widgets/comment/comment.dart
index 89a2cc6..60907b2 100644
--- a/lib/widgets/comment/comment.dart
+++ b/lib/widgets/comment/comment.dart
@@ -256,7 +256,8 @@ class _CommentWidget extends StatelessWidget {
                                   if (store.votingState.isLoading)
                                     SizedBox.fromSize(
                                       size: const Size.square(16),
-                                      child: const CircularProgressIndicator(),
+                                      child: const CircularProgressIndicator
+                                          .adaptive(),
                                     )
                                   else if (configStore.showScores)
                                     Text(
diff --git a/lib/widgets/comment/comment_more_menu_button.dart b/lib/widgets/comment/comment_more_menu_button.dart
index 643f019..9dba60c 100644
--- a/lib/widgets/comment/comment_more_menu_button.dart
+++ b/lib/widgets/comment/comment_more_menu_button.dart
@@ -145,7 +145,7 @@ class _CommentMoreMenuPopup extends HookWidget {
                     ? const SizedBox(
                         height: 20,
                         width: 20,
-                        child: CircularProgressIndicator(),
+                        child: CircularProgressIndicator.adaptive(),
                       )
                     : const Icon(Icons.block),
                 title: Text(
diff --git a/lib/widgets/infinite_scroll.dart b/lib/widgets/infinite_scroll.dart
index 8256cc8..0207fc8 100644
--- a/lib/widgets/infinite_scroll.dart
+++ b/lib/widgets/infinite_scroll.dart
@@ -52,8 +52,8 @@ class InfiniteScroll<T> extends HookWidget {
     this.batchSize = 10,
     this.leading = const SizedBox.shrink(),
     this.padding,
-    this.loadingWidget =
-        const ListTile(title: Center(child: CircularProgressIndicator())),
+    this.loadingWidget = const ListTile(
+        title: Center(child: CircularProgressIndicator.adaptive())),
     required this.itemBuilder,
     required this.fetcher,
     this.controller,
diff --git a/lib/widgets/tile_action.dart b/lib/widgets/tile_action.dart
index 5e4afb6..294aae3 100644
--- a/lib/widgets/tile_action.dart
+++ b/lib/widgets/tile_action.dart
@@ -34,7 +34,7 @@ class TileAction extends StatelessWidget {
         icon: delayedLoading?.loading ?? loading
             ? SizedBox.fromSize(
                 size: const Size.square(22),
-                child: const CircularProgressIndicator(),
+                child: const CircularProgressIndicator.adaptive(),
               )
             : Icon(
                 icon,
diff --git a/lib/widgets/user_profile.dart b/lib/widgets/user_profile.dart
index 7eb6c7d..ddcaf9c 100644
--- a/lib/widgets/user_profile.dart
+++ b/lib/widgets/user_profile.dart
@@ -48,7 +48,7 @@ class UserProfile extends HookWidget {
     }, [userId, instanceHost]);
 
     if (!userDetailsSnap.hasData) {
-      return const Center(child: CircularProgressIndicator());
+      return const Center(child: CircularProgressIndicator.adaptive());
     } else if (userDetailsSnap.hasError) {
       return Center(
         child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
diff --git a/lib/widgets/write_comment.dart b/lib/widgets/write_comment.dart
index 4c1d54f..7d91e51 100644
--- a/lib/widgets/write_comment.dart
+++ b/lib/widgets/write_comment.dart
@@ -123,7 +123,7 @@ class WriteComment extends HookWidget {
                 onPressed:
                     delayed.pending ? () {} : loggedInAction(handleSubmit),
                 child: delayed.loading
-                    ? const CircularProgressIndicator()
+                    ? const CircularProgressIndicator.adaptive()
                     : Text(_isEdit
                         ? L10n.of(context)!.edit
                         : L10n.of(context)!.post),