diff --git a/src/components/common/StickerSet.tsx b/src/components/common/StickerSet.tsx
index cd7f1e077..34ca285b7 100644
--- a/src/components/common/StickerSet.tsx
+++ b/src/components/common/StickerSet.tsx
@@ -291,7 +291,7 @@ const StickerSet: FC<OwnProps> = ({
             onClick={handleDefaultTopicIconClick}
             key="default-topic-icon"
           >
-            <img src={grey} alt="Reset" />
+            <img src={grey} alt="Reset" className="sticker-media" />
           </Button>
         )}
         {withDefaultStatusIcon && (
diff --git a/src/components/common/TopicIcon.tsx b/src/components/common/TopicIcon.tsx
index 4c967512d..8ff0faefd 100644
--- a/src/components/common/TopicIcon.tsx
+++ b/src/components/common/TopicIcon.tsx
@@ -18,6 +18,7 @@ type OwnProps = {
 };
 
 const LOOP_LIMIT = 2;
+const DEFAULT_ICON_ID = '0';
 
 const TopicIcon: FC<OwnProps> = ({
   topic,
@@ -28,7 +29,7 @@ const TopicIcon: FC<OwnProps> = ({
   observeIntersection,
   onClick,
 }) => {
-  if (topic.iconEmojiId) {
+  if (topic.iconEmojiId && topic.iconEmojiId !== DEFAULT_ICON_ID) {
     return (
       <CustomEmoji
         documentId={topic.iconEmojiId}