diff --git a/lib/screens/account/profile.dart b/lib/screens/account/profile.dart
index 96a7c4d..fc7bf75 100644
--- a/lib/screens/account/profile.dart
+++ b/lib/screens/account/profile.dart
@@ -65,23 +65,32 @@ class AccountProfileScreen extends HookConsumerWidget {
                   expandedHeight: 180,
                   pinned: true,
                   leading: PageBackButton(shadows: [iconShadow]),
-                  flexibleSpace: FlexibleSpaceBar(
-                    background:
-                        data.profile.background?.id != null
-                            ? CloudImageWidget(
-                              fileId: data.profile.background!.id,
-                            )
-                            : Container(
-                              color:
-                                  Theme.of(context).appBarTheme.backgroundColor,
-                            ),
-                    title: Text(
-                      data.nick,
-                      style: TextStyle(
-                        color: Theme.of(context).appBarTheme.foregroundColor,
-                        shadows: [iconShadow],
+                  flexibleSpace: Stack(
+                    children: [
+                      Positioned.fill(
+                        child:
+                            data.profile.background?.id != null
+                                ? CloudImageWidget(
+                                  file: data.profile.background,
+                                )
+                                : Container(
+                                  color:
+                                      Theme.of(
+                                        context,
+                                      ).appBarTheme.backgroundColor,
+                                ),
                       ),
-                    ),
+                      FlexibleSpaceBar(
+                        title: Text(
+                          data.nick,
+                          style: TextStyle(
+                            color:
+                                Theme.of(context).appBarTheme.foregroundColor,
+                            shadows: [iconShadow],
+                          ),
+                        ),
+                      ),
+                    ],
                   ),
                 ),
                 SliverToBoxAdapter(
@@ -91,7 +100,7 @@ class AccountProfileScreen extends HookConsumerWidget {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         ProfilePictureWidget(
-                          fileId: data.profile.picture?.id,
+                          file: data.profile.picture,
                           radius: 32,
                         ),
                         const Gap(20),
diff --git a/lib/screens/posts/pub_profile.dart b/lib/screens/posts/pub_profile.dart
index 7e77dee..867c1df 100644
--- a/lib/screens/posts/pub_profile.dart
+++ b/lib/screens/posts/pub_profile.dart
@@ -106,21 +106,32 @@ class PublisherProfileScreen extends HookConsumerWidget {
                   expandedHeight: 180,
                   pinned: true,
                   leading: PageBackButton(shadows: [iconShadow]),
-                  flexibleSpace: FlexibleSpaceBar(
-                    background:
-                        data.background?.id != null
-                            ? CloudImageWidget(fileId: data.background!.id)
-                            : Container(
-                              color:
-                                  Theme.of(context).appBarTheme.backgroundColor,
-                            ),
-                    title: Text(
-                      data.nick,
-                      style: TextStyle(
-                        color: Theme.of(context).appBarTheme.foregroundColor,
-                        shadows: [iconShadow],
+                  flexibleSpace: Stack(
+                    children: [
+                      Positioned.fill(
+                        child:
+                            data.background?.id != null
+                                ? CloudImageWidget(file: data.background)
+                                : Container(
+                                  color:
+                                      Theme.of(
+                                        context,
+                                      ).appBarTheme.backgroundColor,
+                                ),
                       ),
-                    ),
+                      FlexibleSpaceBar(
+                        title: Text(
+                          data.nick,
+                          style: TextStyle(
+                            color:
+                                Theme.of(context).appBarTheme.foregroundColor,
+                            shadows: [iconShadow],
+                          ),
+                        ),
+                        background:
+                            Container(), // Empty container since background is handled by Stack
+                      ),
+                    ],
                   ),
                   actions: [
                     subStatus.when(
@@ -163,10 +174,7 @@ class PublisherProfileScreen extends HookConsumerWidget {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     spacing: 20,
                     children: [
-                      ProfilePictureWidget(
-                        fileId: data.picture!.id,
-                        radius: 32,
-                      ),
+                      ProfilePictureWidget(file: data.picture, radius: 32),
                       Expanded(
                         child: Column(
                           crossAxisAlignment: CrossAxisAlignment.stretch,