diff --git a/public/assets/icons/offline-yellow.png b/public/assets/icons/offline-blue.png
similarity index 71%
rename from public/assets/icons/offline-yellow.png
rename to public/assets/icons/offline-blue.png
index 49076cc5..edc01146 100644
Binary files a/public/assets/icons/offline-yellow.png and b/public/assets/icons/offline-blue.png differ
diff --git a/public/translations/ar/default.json b/public/translations/ar/default.json
index 0e1198b0..8e02e0d3 100644
--- a/public/translations/ar/default.json
+++ b/public/translations/ar/default.json
@@ -219,5 +219,7 @@
   "token_id": "تعريف الرمز",
   "nsfw_boards": "المجالس المخلة بالأدب",
   "hide_gore_boards": "إخفاء لوحات الجور",
-  "hide_adult_boards": "إخفاء لوحات الكبار"
+  "hide_adult_boards": "إخفاء لوحات الكبار",
+  "static_gif": "GIF ثابت",
+  "animated_gif": "GIF متحرك"
 }
\ No newline at end of file
diff --git a/public/translations/bn/default.json b/public/translations/bn/default.json
index fec9dcf1..56091f53 100644
--- a/public/translations/bn/default.json
+++ b/public/translations/bn/default.json
@@ -219,5 +219,7 @@
   "token_id": "টোকেন আইডি",
   "nsfw_boards": "এনএসএফডব্লিউ বোর্ডস",
   "hide_gore_boards": "গর বোর্ডস লুকান",
-  "hide_adult_boards": "পুরুষ বোর্ডস লুকান"
+  "hide_adult_boards": "পুরুষ বোর্ডস লুকান",
+  "static_gif": "স্ট্যাটিক GIF",
+  "animated_gif": "অ্যানিমেটেড GIF"
 }
\ No newline at end of file
diff --git a/public/translations/cs/default.json b/public/translations/cs/default.json
index c0c99373..c48bfafd 100644
--- a/public/translations/cs/default.json
+++ b/public/translations/cs/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token ID",
   "nsfw_boards": "NSFW desky",
   "hide_gore_boards": "Skrýt gore desky",
-  "hide_adult_boards": "Skrýt dospělé desky"
+  "hide_adult_boards": "Skrýt dospělé desky",
+  "static_gif": "Statický GIF",
+  "animated_gif": "Animovaný GIF"
 }
\ No newline at end of file
diff --git a/public/translations/da/default.json b/public/translations/da/default.json
index fd1a654e..8fde6055 100644
--- a/public/translations/da/default.json
+++ b/public/translations/da/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token ID",
   "nsfw_boards": "NSFW boards",
   "hide_gore_boards": "Skjul Gore Boards",
-  "hide_adult_boards": "Skjul Voksne Boards"
+  "hide_adult_boards": "Skjul Voksne Boards",
+  "static_gif": "Statisk GIF",
+  "animated_gif": "Animeret GIF"
 }
\ No newline at end of file
diff --git a/public/translations/de/default.json b/public/translations/de/default.json
index eb8255f8..4bdcc568 100644
--- a/public/translations/de/default.json
+++ b/public/translations/de/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token-ID",
   "nsfw_boards": "NSFW-Boards",
   "hide_gore_boards": "Gore-Boards ausblenden",
-  "hide_adult_boards": "Erwachsenen-Boards ausblenden"
+  "hide_adult_boards": "Erwachsenen-Boards ausblenden",
+  "static_gif": "Statisches GIF",
+  "animated_gif": "Animiertes GIF"
 }
\ No newline at end of file
diff --git a/public/translations/el/default.json b/public/translations/el/default.json
index cb129e82..1520c657 100644
--- a/public/translations/el/default.json
+++ b/public/translations/el/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token ID",
   "nsfw_boards": "Πινακίδες NSFW",
   "hide_gore_boards": "Απόκρυψη των Gore Boards",
-  "hide_adult_boards": "Απόκρυψη των Adult Boards"
+  "hide_adult_boards": "Απόκρυψη των Adult Boards",
+  "static_gif": "Στατικό GIF",
+  "animated_gif": "Κινούμενο GIF"
 }
\ No newline at end of file
diff --git a/public/translations/en/default.json b/public/translations/en/default.json
index cab478e6..b9e799da 100644
--- a/public/translations/en/default.json
+++ b/public/translations/en/default.json
@@ -219,5 +219,7 @@
   "token_id": "token id",
   "nsfw_boards": "NSFW Boards",
   "hide_gore_boards": "Hide Gore Boards",
-  "hide_adult_boards": "Hide Adult Boards"
+  "hide_adult_boards": "Hide Adult Boards",
+  "static_gif": "Static GIF",
+  "animated_gif": "Animated GIF"
 }
\ No newline at end of file
diff --git a/public/translations/es/default.json b/public/translations/es/default.json
index b297722f..0b1dfbb5 100644
--- a/public/translations/es/default.json
+++ b/public/translations/es/default.json
@@ -219,5 +219,7 @@
   "token_id": "ID de token",
   "nsfw_boards": "Tableros NSFW",
   "hide_gore_boards": "Ocultar tableros de gore",
-  "hide_adult_boards": "Ocultar tableros para adultos"
+  "hide_adult_boards": "Ocultar tableros para adultos",
+  "static_gif": "GIF Estático",
+  "animated_gif": "GIF Animado"
 }
\ No newline at end of file
diff --git a/public/translations/fa/default.json b/public/translations/fa/default.json
index 73ad41e6..062f8ec5 100644
--- a/public/translations/fa/default.json
+++ b/public/translations/fa/default.json
@@ -219,5 +219,7 @@
   "token_id": "شناسه توکن",
   "nsfw_boards": "بوردهای NSFW",
   "hide_gore_boards": "پنهان کردن تخته های گور",
-  "hide_adult_boards": "پنهان کردن تخته های بزرگسالان"
+  "hide_adult_boards": "پنهان کردن تخته های بزرگسالان",
+  "static_gif": "GIF ثابت",
+  "animated_gif": "GIF متحرک"
 }
\ No newline at end of file
diff --git a/public/translations/fi/default.json b/public/translations/fi/default.json
index 337a1a05..d2c93a5f 100644
--- a/public/translations/fi/default.json
+++ b/public/translations/fi/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token-id",
   "nsfw_boards": "NSFW-laudat",
   "hide_gore_boards": "Piilota Gore-laudat",
-  "hide_adult_boards": "Piilota Aikuisten lautat"
+  "hide_adult_boards": "Piilota Aikuisten lautat",
+  "static_gif": "Staattinen GIF",
+  "animated_gif": "Animoitu GIF"
 }
\ No newline at end of file
diff --git a/public/translations/fil/default.json b/public/translations/fil/default.json
index 855093be..2e7cf0ab 100644
--- a/public/translations/fil/default.json
+++ b/public/translations/fil/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token ID",
   "nsfw_boards": "Mga NSFW Boards",
   "hide_gore_boards": "Itago ang mga Gore Boards",
-  "hide_adult_boards": "Itago ang mga Adult Boards"
+  "hide_adult_boards": "Itago ang mga Adult Boards",
+  "static_gif": "Static GIF",
+  "animated_gif": "Animated GIF"
 }
\ No newline at end of file
diff --git a/public/translations/fr/default.json b/public/translations/fr/default.json
index c2e83d2a..7c834e7c 100644
--- a/public/translations/fr/default.json
+++ b/public/translations/fr/default.json
@@ -219,5 +219,7 @@
   "token_id": "Identifiant de jeton",
   "nsfw_boards": "Planches NSFW",
   "hide_gore_boards": "Masquer les tableaux Gore",
-  "hide_adult_boards": "Masquer les tableaux pour adultes"
+  "hide_adult_boards": "Masquer les tableaux pour adultes",
+  "static_gif": "GIF Statique",
+  "animated_gif": "GIF Animé"
 }
\ No newline at end of file
diff --git a/public/translations/he/default.json b/public/translations/he/default.json
index 64e331d3..08755782 100644
--- a/public/translations/he/default.json
+++ b/public/translations/he/default.json
@@ -219,5 +219,7 @@
   "token_id": "מזהה טוקן",
   "nsfw_boards": "גלריות NSFW",
   "hide_gore_boards": "הסתר לוחות Gore",
-  "hide_adult_boards": "הסתר לוחות המבוגרים"
+  "hide_adult_boards": "הסתר לוחות המבוגרים",
+  "static_gif": "GIF סטטי",
+  "animated_gif": "GIF מונפש"
 }
\ No newline at end of file
diff --git a/public/translations/hi/default.json b/public/translations/hi/default.json
index c933e714..4a4bb937 100644
--- a/public/translations/hi/default.json
+++ b/public/translations/hi/default.json
@@ -219,5 +219,7 @@
   "token_id": "टोकन आईडी",
   "nsfw_boards": "एनएसएफडब्ल्यू बोर्ड्स",
   "hide_gore_boards": "गोर बोर्ड्स छिपाएं",
-  "hide_adult_boards": "वयस्क बोर्ड्स छिपाएं"
+  "hide_adult_boards": "वयस्क बोर्ड्स छिपाएं",
+  "static_gif": "स्थिर GIF",
+  "animated_gif": "एनिमेटेड GIF"
 }
\ No newline at end of file
diff --git a/public/translations/hu/default.json b/public/translations/hu/default.json
index cc529e16..2e252e9c 100644
--- a/public/translations/hu/default.json
+++ b/public/translations/hu/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token azonosító",
   "nsfw_boards": "NSFW táblák",
   "hide_gore_boards": "Gore táblák elrejtése",
-  "hide_adult_boards": "Felnőtt táblák elrejtése"
+  "hide_adult_boards": "Felnőtt táblák elrejtése",
+  "static_gif": "Statikus GIF",
+  "animated_gif": "Animált GIF"
 }
\ No newline at end of file
diff --git a/public/translations/id/default.json b/public/translations/id/default.json
index 2b79bb60..90d15b7f 100644
--- a/public/translations/id/default.json
+++ b/public/translations/id/default.json
@@ -219,5 +219,7 @@
   "token_id": "ID token",
   "nsfw_boards": "Papan NSFW",
   "hide_gore_boards": "Sembunyikan Papan Gore",
-  "hide_adult_boards": "Sembunyikan Papan Dewasa"
+  "hide_adult_boards": "Sembunyikan Papan Dewasa",
+  "static_gif": "GIF Statis",
+  "animated_gif": "GIF Animasi"
 }
\ No newline at end of file
diff --git a/public/translations/it/default.json b/public/translations/it/default.json
index f5db74ae..86ac5988 100644
--- a/public/translations/it/default.json
+++ b/public/translations/it/default.json
@@ -219,5 +219,7 @@
   "token_id": "token id",
   "nsfw_boards": "Bache NSFW",
   "hide_gore_boards": "Nascondi tavole Gore",
-  "hide_adult_boards": "Nascondi tavole per adulti"
+  "hide_adult_boards": "Nascondi tavole per adulti",
+  "static_gif": "GIF Statica",
+  "animated_gif": "GIF Animata"
 }
\ No newline at end of file
diff --git a/public/translations/ja/default.json b/public/translations/ja/default.json
index 8dd8b346..66b4eba8 100644
--- a/public/translations/ja/default.json
+++ b/public/translations/ja/default.json
@@ -219,5 +219,7 @@
   "token_id": "トークンID",
   "nsfw_boards": "NSFWボード",
   "hide_gore_boards": "ゴアボードを非表示にする",
-  "hide_adult_boards": "アダルトボードを非表示にする"
+  "hide_adult_boards": "アダルトボードを非表示にする",
+  "static_gif": "静的GIF",
+  "animated_gif": "アニメーションGIF"
 }
\ No newline at end of file
diff --git a/public/translations/ko/default.json b/public/translations/ko/default.json
index c89cc9cc..21f8dd21 100644
--- a/public/translations/ko/default.json
+++ b/public/translations/ko/default.json
@@ -219,5 +219,7 @@
   "token_id": "토큰 ID",
   "nsfw_boards": "NSFW 게시판",
   "hide_gore_boards": "고어 게시판 숨기기",
-  "hide_adult_boards": "성인 게시판 숨기기"
+  "hide_adult_boards": "성인 게시판 숨기기",
+  "static_gif": "정적 GIF",
+  "animated_gif": "애니메이션 GIF"
 }
\ No newline at end of file
diff --git a/public/translations/mr/default.json b/public/translations/mr/default.json
index d91f4681..c7daec0b 100644
--- a/public/translations/mr/default.json
+++ b/public/translations/mr/default.json
@@ -219,5 +219,7 @@
   "token_id": "टोकन आयडी",
   "nsfw_boards": "NSFW बोर्ड्स",
   "hide_gore_boards": "गोर बोर्ड्स लपवा",
-  "hide_adult_boards": "वयस्क बोर्ड्स लपवा"
+  "hide_adult_boards": "वयस्क बोर्ड्स लपवा",
+  "static_gif": "स्थिर GIF",
+  "animated_gif": "एनिमेटेड GIF"
 }
\ No newline at end of file
diff --git a/public/translations/nl/default.json b/public/translations/nl/default.json
index e1152931..17e8e4dd 100644
--- a/public/translations/nl/default.json
+++ b/public/translations/nl/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token-ID",
   "nsfw_boards": "NSFW-boards",
   "hide_gore_boards": "Gore Boards verbergen",
-  "hide_adult_boards": "Volwassenen Boards verbergen"
+  "hide_adult_boards": "Volwassenen Boards verbergen",
+  "static_gif": "Statische GIF",
+  "animated_gif": "Geanimeerde GIF"
 }
\ No newline at end of file
diff --git a/public/translations/no/default.json b/public/translations/no/default.json
index 24988b7c..c4c0da7a 100644
--- a/public/translations/no/default.json
+++ b/public/translations/no/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token ID",
   "nsfw_boards": "NSFW-boards",
   "hide_gore_boards": "Skjul Gore Boards",
-  "hide_adult_boards": "Skjul voksne Boards"
+  "hide_adult_boards": "Skjul voksne Boards",
+  "static_gif": "Statisk GIF",
+  "animated_gif": "Animasjons GIF"
 }
\ No newline at end of file
diff --git a/public/translations/pl/default.json b/public/translations/pl/default.json
index 9c84f12b..e08bd44c 100644
--- a/public/translations/pl/default.json
+++ b/public/translations/pl/default.json
@@ -219,5 +219,7 @@
   "token_id": "Identyfikator tokena",
   "nsfw_boards": "Deski NSFW",
   "hide_gore_boards": "Ukryj Gore Boards",
-  "hide_adult_boards": "Ukryj Adult Boards"
+  "hide_adult_boards": "Ukryj Adult Boards",
+  "static_gif": "Statyczny GIF",
+  "animated_gif": "Animowany GIF"
 }
\ No newline at end of file
diff --git a/public/translations/pt/default.json b/public/translations/pt/default.json
index d8f2dfb8..276a3b67 100644
--- a/public/translations/pt/default.json
+++ b/public/translations/pt/default.json
@@ -219,5 +219,7 @@
   "token_id": "ID do token",
   "nsfw_boards": "Quadros NSFW",
   "hide_gore_boards": "Ocultar Quadros Gore",
-  "hide_adult_boards": "Ocultar Quadros para Adultos"
+  "hide_adult_boards": "Ocultar Quadros para Adultos",
+  "static_gif": "GIF Estático",
+  "animated_gif": "GIF Animado"
 }
\ No newline at end of file
diff --git a/public/translations/ro/default.json b/public/translations/ro/default.json
index f2580bae..540fa429 100644
--- a/public/translations/ro/default.json
+++ b/public/translations/ro/default.json
@@ -219,5 +219,7 @@
   "token_id": "ID token",
   "nsfw_boards": "Plăci NSFW",
   "hide_gore_boards": "Ascundeți tablourile Gore",
-  "hide_adult_boards": "Ascundeți tablourile pentru adulți"
+  "hide_adult_boards": "Ascundeți tablourile pentru adulți",
+  "static_gif": "GIF Static",
+  "animated_gif": "GIF Animat"
 }
\ No newline at end of file
diff --git a/public/translations/ru/default.json b/public/translations/ru/default.json
index e0cff6fa..53f19296 100644
--- a/public/translations/ru/default.json
+++ b/public/translations/ru/default.json
@@ -219,5 +219,7 @@
   "token_id": "Идентификатор токена",
   "nsfw_boards": "NSFW доски",
   "hide_gore_boards": "Скрыть доски Gore",
-  "hide_adult_boards": "Скрыть доски для взрослых"
+  "hide_adult_boards": "Скрыть доски для взрослых",
+  "static_gif": "Статичный GIF",
+  "animated_gif": "Анимированный GIF"
 }
\ No newline at end of file
diff --git a/public/translations/sq/default.json b/public/translations/sq/default.json
index aa589dbb..0328b275 100644
--- a/public/translations/sq/default.json
+++ b/public/translations/sq/default.json
@@ -219,5 +219,7 @@
   "token_id": "ID e tokenit",
   "nsfw_boards": "Bordet NSFW",
   "hide_gore_boards": "Fshihet Gore Boards",
-  "hide_adult_boards": "Fshihet Adult Boards"
+  "hide_adult_boards": "Fshihet Adult Boards",
+  "static_gif": "GIF Statik",
+  "animated_gif": "GIF i Animuar"
 }
\ No newline at end of file
diff --git a/public/translations/sv/default.json b/public/translations/sv/default.json
index 83e0e347..f1348820 100644
--- a/public/translations/sv/default.json
+++ b/public/translations/sv/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token ID",
   "nsfw_boards": "NSFW-boards",
   "hide_gore_boards": "Dölj Gore Boards",
-  "hide_adult_boards": "Dölj vuxna Boards"
+  "hide_adult_boards": "Dölj vuxna Boards",
+  "static_gif": "Statisk GIF",
+  "animated_gif": "Animerad GIF"
 }
\ No newline at end of file
diff --git a/public/translations/te/default.json b/public/translations/te/default.json
index 89169703..f0b895a7 100644
--- a/public/translations/te/default.json
+++ b/public/translations/te/default.json
@@ -219,5 +219,7 @@
   "token_id": "టోకెన్ ఐడి",
   "nsfw_boards": "NSFW బోర్డ్లు",
   "hide_gore_boards": "గోర్ బోర్డ్స్ దాచు",
-  "hide_adult_boards": "పురుషులు బోర్డ్లు దాచు"
+  "hide_adult_boards": "పురుషులు బోర్డ్లు దాచు",
+  "static_gif": "స్టాటిక్ GIF",
+  "animated_gif": "అనిమేటెడ్ GIF"
 }
\ No newline at end of file
diff --git a/public/translations/th/default.json b/public/translations/th/default.json
index b4b181ca..38d35bd0 100644
--- a/public/translations/th/default.json
+++ b/public/translations/th/default.json
@@ -219,5 +219,7 @@
   "token_id": "รหัสโทเค็น",
   "nsfw_boards": "กระดาน NSFW",
   "hide_gore_boards": "ซ่อนกระดาน Gore",
-  "hide_adult_boards": "ซ่อนกระดานสำหรับผู้ใหญ่"
+  "hide_adult_boards": "ซ่อนกระดานสำหรับผู้ใหญ่",
+  "static_gif": "GIF แบบคงที่",
+  "animated_gif": "GIF ที่เคลื่อนไหว"
 }
\ No newline at end of file
diff --git a/public/translations/tr/default.json b/public/translations/tr/default.json
index 08d5a65a..a3b59b75 100644
--- a/public/translations/tr/default.json
+++ b/public/translations/tr/default.json
@@ -219,5 +219,7 @@
   "token_id": "Token kimliği",
   "nsfw_boards": "NSFW Panoları",
   "hide_gore_boards": "Gore Panolarını Gizle",
-  "hide_adult_boards": "Yetişkin Panolarını Gizle"
+  "hide_adult_boards": "Yetişkin Panolarını Gizle",
+  "static_gif": "Statik GIF",
+  "animated_gif": "Animasyonlu GIF"
 }
\ No newline at end of file
diff --git a/public/translations/uk/default.json b/public/translations/uk/default.json
index 4974d45d..22fbb8fa 100644
--- a/public/translations/uk/default.json
+++ b/public/translations/uk/default.json
@@ -219,5 +219,7 @@
   "token_id": "Ідентифікатор токена",
   "nsfw_boards": "NSFW дошки",
   "hide_gore_boards": "Сховати дошки Gore",
-  "hide_adult_boards": "Сховати дошки для дорослих"
+  "hide_adult_boards": "Сховати дошки для дорослих",
+  "static_gif": "Статичний GIF",
+  "animated_gif": "Анімований GIF"
 }
\ No newline at end of file
diff --git a/public/translations/ur/default.json b/public/translations/ur/default.json
index 4932bdbb..714dcce0 100644
--- a/public/translations/ur/default.json
+++ b/public/translations/ur/default.json
@@ -219,5 +219,7 @@
   "token_id": "ٹوکن شناخت",
   "nsfw_boards": "این ایس ایف ڈبلیو بورڈس",
   "hide_gore_boards": "گور بورڈز چھپائیں",
-  "hide_adult_boards": "بالغ بورڈز چھپائیں"
+  "hide_adult_boards": "بالغ بورڈز چھپائیں",
+  "static_gif": "اسٹیٹک GIF",
+  "animated_gif": "اینیمیٹڈ GIF"
 }
\ No newline at end of file
diff --git a/public/translations/vi/default.json b/public/translations/vi/default.json
index 215626c6..52620130 100644
--- a/public/translations/vi/default.json
+++ b/public/translations/vi/default.json
@@ -219,5 +219,7 @@
   "token_id": "ID token",
   "nsfw_boards": "Các bảng NSFW",
   "hide_gore_boards": "Ẩn Gore Boards",
-  "hide_adult_boards": "Ẩn Adult Boards"
+  "hide_adult_boards": "Ẩn Adult Boards",
+  "static_gif": "GIF Tĩnh",
+  "animated_gif": "GIF Hoạt Hình"
 }
\ No newline at end of file
diff --git a/public/translations/zh/default.json b/public/translations/zh/default.json
index 2a4ea982..b8a0df0c 100644
--- a/public/translations/zh/default.json
+++ b/public/translations/zh/default.json
@@ -219,5 +219,7 @@
   "token_id": "令牌ID",
   "nsfw_boards": "NSFW板块",
   "hide_gore_boards": "隐藏Gore板块",
-  "hide_adult_boards": "隐藏成人板块"
+  "hide_adult_boards": "隐藏成人板块",
+  "static_gif": "静态GIF",
+  "animated_gif": "动画GIF"
 }
\ No newline at end of file
diff --git a/src/components/catalog-row/catalog-row.tsx b/src/components/catalog-row/catalog-row.tsx
index e72c8c16..feed9225 100644
--- a/src/components/catalog-row/catalog-row.tsx
+++ b/src/components/catalog-row/catalog-row.tsx
@@ -79,8 +79,8 @@ export const CatalogPostMedia = ({ commentMediaInfo, isOutOfFeed, linkWidth, lin
     thumbnailComponent = <img src={thumbnail} alt='' onLoad={handleLoad} onError={handleError} style={loadingStyle} />;
   } else if (type === 'iframe' && iframeThumbnail && !hasError) {
     thumbnailComponent = <img src={iframeThumbnail} alt='' onLoad={handleLoad} onError={handleError} style={loadingStyle} />;
-  } else if (type === 'gif' && gifFrameUrl && !hasError) {
-    thumbnailComponent = <img src={gifFrameUrl} alt='' onLoad={handleLoad} onError={handleError} style={loadingStyle} />;
+  } else if (type === 'gif' && !hasError) {
+    thumbnailComponent = <img src={gifFrameUrl || url} alt='' onLoad={handleLoad} onError={handleError} style={loadingStyle} />;
   } else if (type === 'audio') {
     thumbnailComponent = <audio src={url} controls />;
   }
diff --git a/src/components/comment-media/comment-media.tsx b/src/components/comment-media/comment-media.tsx
index fdc48e74..329a0739 100644
--- a/src/components/comment-media/comment-media.tsx
+++ b/src/components/comment-media/comment-media.tsx
@@ -68,6 +68,8 @@ const Thumbnail = ({ commentMediaInfo, isFloatingEmbed, post, setShowThumbnail }
     thumbnailComponent = iframeThumbnail ? <img src={iframeThumbnail} alt='' onClick={() => setShowThumbnail(false)} /> : null;
   } else if (type === 'gif' && gifFrameUrl) {
     thumbnailComponent = <img src={gifFrameUrl} alt='' onClick={() => setShowThumbnail(false)} />;
+  } else if (type === 'gif' && !gifFrameUrl) {
+    thumbnailComponent = <img src={url} alt='' onClick={() => setShowThumbnail(false)} />;
   } else if (type === 'audio') {
     thumbnailComponent = <audio src={url} controls />;
   }
@@ -145,7 +147,15 @@ const Media = ({ commentMediaInfo, isReply, setShowThumbnail }: MediaProps) => {
 const CommentMedia = ({ commentMediaInfo, isFloatingEmbed, post, showThumbnail, setShowThumbnail }: MediaProps) => {
   const { t } = useTranslation();
   const isMobile = useIsMobile();
-  const { type, url } = commentMediaInfo || {};
+  const { url } = commentMediaInfo || {};
+  let type = commentMediaInfo?.type;
+  const gifFrameUrl = useFetchGifFirstFrame(url);
+
+  if (type === 'gif' && gifFrameUrl) {
+    type = 'animated gif';
+  } else if (type === 'gif' && !gifFrameUrl) {
+    type = 'static gif';
+  }
 
   return (
     <span className={styles.content}>
diff --git a/src/components/post-desktop/post-desktop.tsx b/src/components/post-desktop/post-desktop.tsx
index e10edede..9e3f9d29 100644
--- a/src/components/post-desktop/post-desktop.tsx
+++ b/src/components/post-desktop/post-desktop.tsx
@@ -25,6 +25,7 @@ import Tooltip from '../tooltip';
 import { PostProps } from '../../views/post/post';
 import { create } from 'zustand';
 import _ from 'lodash';
+import useFetchGifFirstFrame from '../../hooks/use-fetch-gif-first-frame';
 
 interface ShowOmittedRepliesState {
   showOmittedReplies: Record<string, boolean>;
@@ -100,7 +101,11 @@ const PostInfo = ({ openReplyModal, post, postReplyCount = 0, roles, isHidden }:
         </span>
         {!(isDescription || isRules) && (
           <>
-            {isReply && author?.avatar && <span className={styles.authorAvatar} style={{ backgroundImage: `url(${avatarImageUrl})` }} />}
+            {isReply && author?.avatar && (
+              <>
+                <span className={styles.authorAvatar} style={{ backgroundImage: `url(${avatarImageUrl})` }} />{' '}
+              </>
+            )}
             (u/
             <Tooltip
               children={
@@ -180,7 +185,17 @@ const PostMedia = ({ post }: PostProps) => {
   const { t } = useTranslation();
   const { link, spoiler } = post || {};
   const commentMediaInfo = getCommentMediaInfo(post);
-  const { type, url } = commentMediaInfo || {};
+
+  const { url } = commentMediaInfo || {};
+  let type = commentMediaInfo?.type;
+  const gifFrameUrl = useFetchGifFirstFrame(url);
+
+  if (type === 'gif' && gifFrameUrl !== null) {
+    type = 'animated gif';
+  } else if (type === 'gif' && gifFrameUrl === null) {
+    type = 'static gif';
+  }
+
   const embedUrl = url && new URL(url);
   const hasThumbnail = getHasThumbnail(commentMediaInfo, link);
   const [showThumbnail, setShowThumbnail] = useState(true);
@@ -417,7 +432,7 @@ const PostDesktop = ({ openReplyModal, post, roles, showAllReplies, showReplies
             )}
           </span>
         )}
-        {replyCount === undefined && (
+        {post?.replyCount === undefined && (
           <span className={styles.loadingString}>
             <LoadingEllipsis string={t('loading_comments')} />
           </span>
diff --git a/src/components/post-form/post-form.tsx b/src/components/post-form/post-form.tsx
index eb63ce62..2da9cd37 100644
--- a/src/components/post-form/post-form.tsx
+++ b/src/components/post-form/post-form.tsx
@@ -1,7 +1,17 @@
 import { useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
-import { PublishCommentOptions, setAccount, useAccount, useAccountComment, useComment, usePublishComment, useSubplebbit } from '@plebbit/plebbit-react-hooks';
+import {
+  Comment,
+  PublishCommentOptions,
+  setAccount,
+  useAccount,
+  useAccountComment,
+  useComment,
+  useEditedComment,
+  usePublishComment,
+  useSubplebbit,
+} from '@plebbit/plebbit-react-hooks';
 import { create } from 'zustand';
 import { alertChallengeVerificationFailed } from '../../lib/utils/challenge-utils';
 import { getLinkMediaInfo } from '../../lib/utils/media-utils';
@@ -265,7 +275,14 @@ const PostForm = () => {
   const isInAllView = isAllView(location.pathname, params);
   const isInSubscriptionsView = isSubscriptionsView(location.pathname, useParams());
 
-  const comment = useComment({ commentCid: useParams().commentCid });
+  const post = useComment({ commentCid: useParams().commentCid });
+  let comment: Comment = post;
+  // handle pending mod or author edit
+  const { editedComment } = useEditedComment({ comment });
+  if (editedComment) {
+    comment = editedComment;
+  }
+
   const { deleted, locked, removed } = comment || {};
   const isThreadClosed = deleted || locked || removed || isInDescriptionView || isInRulesView;
 
diff --git a/src/components/post-mobile/post-mobile.tsx b/src/components/post-mobile/post-mobile.tsx
index 3bc81123..283edf32 100644
--- a/src/components/post-mobile/post-mobile.tsx
+++ b/src/components/post-mobile/post-mobile.tsx
@@ -74,7 +74,11 @@ const PostInfoAndMedia = ({ openReplyModal, post, postReplyCount = 0, roles }: P
           </span>
           {!(isDescription || isRules) && (
             <>
-              {isReply && author?.avatar && <span className={styles.authorAvatar} style={{ backgroundImage: `url(${avatarImageUrl})` }} />}
+              {isReply && author?.avatar && (
+                <>
+                  <span className={styles.authorAvatar} style={{ backgroundImage: `url(${avatarImageUrl})` }} />{' '}
+                </>
+              )}
               (u/
               <Tooltip
                 children={
@@ -342,7 +346,7 @@ const PostMobile = ({ openReplyModal, post, roles, showAllReplies, showReplies =
                 </div>
               )}
             </div>
-            {replyCount === undefined && (
+            {post?.replyCount === undefined && (
               <span className={styles.loadingString}>
                 <LoadingEllipsis string={t('loading_comments')} />
               </span>
diff --git a/src/components/settings-modal/avatar-settings/avatar-settings.tsx b/src/components/settings-modal/avatar-settings/avatar-settings.tsx
index c5d91c34..c35ea756 100644
--- a/src/components/settings-modal/avatar-settings/avatar-settings.tsx
+++ b/src/components/settings-modal/avatar-settings/avatar-settings.tsx
@@ -31,7 +31,7 @@ const AvatarPreview = ({ avatar }: any) => {
       </div>
       {state !== 'succeeded' && account?.author?.avatar && (
         <div className={styles.state}>
-          {stateText} {error?.message}
+          {!error && stateText} {error && error?.message}
         </div>
       )}
     </>
diff --git a/src/index.css b/src/index.css
index 918e52c5..78c662ed 100644
--- a/src/index.css
+++ b/src/index.css
@@ -39,7 +39,7 @@ hr {
 }
 
 .yellowOfflineIcon {
-  background-image: url('/public/assets/icons/offline-yellow.png');
+  background-image: url('/public/assets/icons/offline-blue.png');
 }
 
 .redOfflineIcon {
diff --git a/src/lib/utils/media-utils.ts b/src/lib/utils/media-utils.ts
index 073ce65e..9658cbbc 100644
--- a/src/lib/utils/media-utils.ts
+++ b/src/lib/utils/media-utils.ts
@@ -15,8 +15,10 @@ export const getDisplayMediaInfoType = (type: string, t: any) => {
   switch (type) {
     case 'image':
       return t('image');
-    case 'gif':
-      return t('gif');
+    case 'animated gif':
+      return t('animated_gif');
+    case 'static gif':
+      return t('static_gif');
     case 'iframe':
       return t('iframe');
     case 'video':
diff --git a/src/stores/use-subplebbit-offline-store.ts b/src/stores/use-subplebbit-offline-store.ts
index 4fcb8b0d..abaa6979 100644
--- a/src/stores/use-subplebbit-offline-store.ts
+++ b/src/stores/use-subplebbit-offline-store.ts
@@ -44,7 +44,7 @@ const useSubplebbitOfflineStore = create<SubplebbitOfflineStore>((set) => ({
           },
         },
       }));
-    }, 7000);
+    }, 30000);
   },
 }));
 
diff --git a/src/views/post/post.module.css b/src/views/post/post.module.css
index 93c9b554..b623960d 100644
--- a/src/views/post/post.module.css
+++ b/src/views/post/post.module.css
@@ -505,14 +505,13 @@
 }
 
 .authorAvatar {
-  width: 32px;
-  height: 32px;
+  width: 22px;
+  height: 22px;
   background-size: 100%;
   background-position: center;
   background-repeat: no-repeat;
   display: inline-block;
-  vertical-align: middle;
-  border-radius: 16px;
+  vertical-align: top;
 }
 
 @media (max-width: 640px) {
@@ -531,7 +530,11 @@
   .loadingString {
     margin-top: 10px;
     margin-left: 5px;
-  } 
+  }
+
+  .authorAvatar {
+    vertical-align: middle;
+  }
 }
 
 @media (min-width: 640px) {