diff --git a/lib/main.dart b/lib/main.dart
index 8f1f966..2572117 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -124,8 +124,8 @@ class MyHomePage extends HookWidget {
             children: [
               tabButton(Icons.home),
               tabButton(Icons.list),
-              Container(),
-              Container(),
+              SizedBox.shrink(),
+              SizedBox.shrink(),
               tabButton(Icons.search),
               tabButton(Icons.person),
             ],
diff --git a/lib/pages/add_account.dart b/lib/pages/add_account.dart
index 9beea28..819210b 100644
--- a/lib/pages/add_account.dart
+++ b/lib/pages/add_account.dart
@@ -120,7 +120,7 @@ class AddAccountPage extends HookWidget {
                   url: icon.value,
                   child: CachedNetworkImage(
                     imageUrl: icon.value,
-                    errorWidget: (_, __, ___) => Container(),
+                    errorWidget: (_, __, ___) => SizedBox.shrink(),
                   ),
                 ),
               ),
diff --git a/lib/pages/add_instance.dart b/lib/pages/add_instance.dart
index b43b415..fd4d2cd 100644
--- a/lib/pages/add_instance.dart
+++ b/lib/pages/add_instance.dart
@@ -80,7 +80,7 @@ class AddInstancePage extends HookWidget {
                 child: FullscreenableImage(
                   child: CachedNetworkImage(
                     imageUrl: icon.value,
-                    errorWidget: (_, __, ___) => Container(),
+                    errorWidget: (_, __, ___) => SizedBox.shrink(),
                   ),
                   url: icon.value,
                 ))
diff --git a/lib/pages/community.dart b/lib/pages/community.dart
index d3b1719..d5f3906 100644
--- a/lib/pages/community.dart
+++ b/lib/pages/community.dart
@@ -302,7 +302,7 @@ class _CommunityOverview extends StatelessWidget {
           url: community.banner,
           child: CachedNetworkImage(
             imageUrl: community.banner,
-            errorWidget: (_, __, ___) => Container(),
+            errorWidget: (_, __, ___) => SizedBox.shrink(),
           ),
         ),
       SafeArea(
diff --git a/lib/pages/instance.dart b/lib/pages/instance.dart
index 36e2857..3f117a6 100644
--- a/lib/pages/instance.dart
+++ b/lib/pages/instance.dart
@@ -168,7 +168,7 @@ class InstancePage extends HookWidget {
                       url: site.site.banner,
                       child: CachedNetworkImage(
                         imageUrl: site.site.banner,
-                        errorWidget: (_, __, ___) => Container(),
+                        errorWidget: (_, __, ___) => SizedBox.shrink(),
                       ),
                     ),
                   SafeArea(
diff --git a/lib/widgets/comment.dart b/lib/widgets/comment.dart
index cf54f15..30dc79e 100644
--- a/lib/widgets/comment.dart
+++ b/lib/widgets/comment.dart
@@ -251,7 +251,7 @@ class Comment extends HookWidget {
     }();
 
     final actions = collapsed.value
-        ? Container()
+        ? SizedBox.shrink()
         : Row(children: [
             if (selectable.value && !comment.deleted && !comment.removed)
               _CommentAction(
@@ -324,7 +324,7 @@ class Comment extends HookWidget {
                               ),
                             ),
                           ),
-                          errorWidget: (_, __, ___) => Container(),
+                          errorWidget: (_, __, ___) => SizedBox.shrink(),
                         ),
                       ),
                     ),
diff --git a/lib/widgets/infinite_scroll.dart b/lib/widgets/infinite_scroll.dart
index f8d21f3..4da833a 100644
--- a/lib/widgets/infinite_scroll.dart
+++ b/lib/widgets/infinite_scroll.dart
@@ -29,7 +29,7 @@ class InfiniteScroll<T> extends HookWidget {
 
   InfiniteScroll({
     this.batchSize = 10,
-    this.prepend = const SizedBox(height: 0, width: 0),
+    this.prepend = const SizedBox.shrink(),
     this.padding,
     this.loadingWidget =
         const ListTile(title: Center(child: CircularProgressIndicator())),
@@ -71,7 +71,7 @@ class InfiniteScroll<T> extends HookWidget {
         if (i == data.value.length) {
           // if there are no more, skip
           if (!hasMore.current) {
-            return Container();
+            return SizedBox.shrink();
           }
 
           // if it's already fetching more, skip
diff --git a/lib/widgets/user_profile.dart b/lib/widgets/user_profile.dart
index 60d9740..15e98ca 100644
--- a/lib/widgets/user_profile.dart
+++ b/lib/widgets/user_profile.dart
@@ -96,7 +96,7 @@ class UserProfile extends HookWidget {
           if (userViewSnap.data?.banner != null)
             CachedNetworkImage(
               imageUrl: userViewSnap.data.banner,
-              errorWidget: (_, __, ___) => Container(),
+              errorWidget: (_, __, ___) => SizedBox.shrink(),
             )
           else
             Container(
@@ -155,7 +155,7 @@ class UserProfile extends HookWidget {
                         borderRadius: BorderRadius.all(Radius.circular(12)),
                         child: CachedNetworkImage(
                           imageUrl: userViewSnap.data.avatar,
-                          errorWidget: (_, __, ___) => Container(),
+                          errorWidget: (_, __, ___) => SizedBox.shrink(),
                         ),
                       ),
                     ),