diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart
index 719c3bf25c..f3bf6309d5 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart
@@ -500,7 +500,7 @@ class CurrentSpace extends StatelessWidget {
           SpaceIcon(
             dimension: 22,
             space: space,
-            svgSize: 13,
+            svgSize: 12,
             cornerRadius: 8.0,
           ),
           const HSpace(10),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon.dart
index 43c8fccdd2..3500085071 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon.dart
@@ -39,9 +39,10 @@ class SpaceIcon extends StatelessWidget {
         height: dimension,
         color: color,
         child: Center(
-          child: svgSize == null
-              ? svg
-              : SizedBox.square(dimension: svgSize!, child: svg),
+          child:
+              svgSize == null || space.spaceIcon?.contains('space_icon') == true
+                  ? svg
+                  : SizedBox.square(dimension: svgSize!, child: svg),
         ),
       ),
     );
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart
index 83ce2c21b8..77f5513e97 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart
@@ -119,6 +119,20 @@ class _SpaceIconPopupState extends State<SpaceIconPopup> {
                       dimension: 32,
                       iconDimension: 32,
                     );
+                  } else if (value.contains('space_icon')) {
+                    child = ClipRRect(
+                      borderRadius: BorderRadius.circular(widget.cornerRadius),
+                      child: Container(
+                        color: Color(int.parse(color)),
+                        child: Align(
+                          child: FlowySvg(
+                            FlowySvgData('assets/flowy_icons/16x/$value.svg'),
+                            size: const Size.square(42),
+                            color: Theme.of(context).colorScheme.surface,
+                          ),
+                        ),
+                      ),
+                    );
                   } else {
                     final content = kIconGroups?.findSvgContent(value);
                     if (content == null) {