diff --git a/lib/pangea/chat_settings/pages/edit_course.dart b/lib/pangea/chat_settings/pages/edit_course.dart
index 43ef6c657..43a947f97 100644
--- a/lib/pangea/chat_settings/pages/edit_course.dart
+++ b/lib/pangea/chat_settings/pages/edit_course.dart
@@ -10,6 +10,7 @@ import 'package:fluffychat/pangea/course_plans/map_clipper.dart';
 import 'package:fluffychat/utils/file_selector.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart';
+import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 
@@ -204,12 +205,13 @@ class EditCourseController extends State<EditCourse> {
                                                 width: 200.0,
                                                 borderRadius:
                                                     BorderRadius.circular(0.0),
-                                                replacement: Container(
-                                                  width: 200.0,
-                                                  height: 200.0,
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .surfaceContainerHighest,
+                                                replacement: Avatar(
+                                                  name: _room?.name,
+                                                  borderRadius:
+                                                      BorderRadius.circular(
+                                                    0.0,
+                                                  ),
+                                                  size: 200.0,
                                                 ),
                                               ),
                                       ),
diff --git a/lib/pangea/course_creation/course_plan_tile_widget.dart b/lib/pangea/course_creation/course_plan_tile_widget.dart
index 5205b9a46..af39160fe 100644
--- a/lib/pangea/course_creation/course_plan_tile_widget.dart
+++ b/lib/pangea/course_creation/course_plan_tile_widget.dart
@@ -6,6 +6,7 @@ import 'package:fluffychat/pangea/common/widgets/url_image_widget.dart';
 import 'package:fluffychat/pangea/course_creation/course_info_chip_widget.dart';
 import 'package:fluffychat/pangea/course_plans/courses/course_plan_model.dart';
 import 'package:fluffychat/pangea/course_plans/map_clipper.dart';
+import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/hover_builder.dart';
 
 class CoursePlanTile extends StatelessWidget {
@@ -50,12 +51,10 @@ class CoursePlanTile extends StatelessWidget {
                       imageUrl: course.imageUrl,
                       borderRadius: BorderRadius.circular(0.0),
                       width: 40.0,
-                      replacement: Container(
-                        width: 40.0,
-                        height: 40.0,
-                        decoration: BoxDecoration(
-                          color: theme.colorScheme.secondary,
-                        ),
+                      replacement: Avatar(
+                        name: course.title,
+                        size: 40.0,
+                        borderRadius: BorderRadius.circular(0.0),
                       ),
                     ),
                   ),
diff --git a/lib/pangea/course_creation/selected_course_view.dart b/lib/pangea/course_creation/selected_course_view.dart
index 0027c3663..463ceb453 100644
--- a/lib/pangea/course_creation/selected_course_view.dart
+++ b/lib/pangea/course_creation/selected_course_view.dart
@@ -7,6 +7,7 @@ import 'package:fluffychat/pangea/course_creation/course_info_chip_widget.dart';
 import 'package:fluffychat/pangea/course_creation/selected_course_page.dart';
 import 'package:fluffychat/pangea/course_plans/map_clipper.dart';
 import 'package:fluffychat/pangea/course_settings/pin_clipper.dart';
+import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
 
 class SelectedCourseView extends StatelessWidget {
@@ -81,13 +82,11 @@ class SelectedCourseView extends StatelessWidget {
                                             width: 100.0,
                                             borderRadius:
                                                 BorderRadius.circular(0.0),
-                                            replacement: Container(
-                                              width: 100.0,
-                                              height: 100.0,
-                                              decoration: BoxDecoration(
-                                                color:
-                                                    theme.colorScheme.secondary,
-                                              ),
+                                            replacement: Avatar(
+                                              name: displayname,
+                                              size: 100.0,
+                                              borderRadius:
+                                                  BorderRadius.circular(0.0),
                                             ),
                                           ),
                                         ),
diff --git a/lib/pangea/login/pages/new_course_page.dart b/lib/pangea/login/pages/new_course_page.dart
index 01a3bff97..9ad351994 100644
--- a/lib/pangea/login/pages/new_course_page.dart
+++ b/lib/pangea/login/pages/new_course_page.dart
@@ -309,17 +309,12 @@ class NewCoursePageState extends State<NewCoursePage> {
                                           width: 58.0,
                                           borderRadius:
                                               BorderRadius.circular(10.0),
-                                          replacement: Container(
-                                            height: 58.0,
-                                            width: 58.0,
-                                            decoration: BoxDecoration(
-                                              borderRadius:
-                                                  BorderRadius.circular(
-                                                10.0,
-                                              ),
-                                              color: theme
-                                                  .colorScheme.surfaceContainer,
+                                          replacement: Avatar(
+                                            name: course.title,
+                                            borderRadius: BorderRadius.circular(
+                                              10.0,
                                             ),
+                                            size: 58.0,
                                           ),
                                         ),
                                         Flexible(
diff --git a/lib/pangea/login/pages/public_courses_page.dart b/lib/pangea/login/pages/public_courses_page.dart
index 710d300f5..466656e00 100644
--- a/lib/pangea/login/pages/public_courses_page.dart
+++ b/lib/pangea/login/pages/public_courses_page.dart
@@ -279,15 +279,12 @@ class PublicCoursesPageState extends State<PublicCoursesPage> {
                                         width: 58.0,
                                         borderRadius:
                                             BorderRadius.circular(10.0),
-                                        replacement: Container(
-                                          height: 58.0,
-                                          width: 58.0,
-                                          decoration: BoxDecoration(
-                                            borderRadius:
-                                                BorderRadius.circular(10.0),
-                                            color: theme
-                                                .colorScheme.surfaceContainer,
+                                        replacement: Avatar(
+                                          name: displayname,
+                                          borderRadius: BorderRadius.circular(
+                                            10.0,
                                           ),
+                                          size: 58.0,
                                         ),
                                       ),
                                       Flexible(