diff --git a/app/src/main/java/com/gh/common/view/ImageContainerView.kt b/app/src/main/java/com/gh/common/view/ImageContainerView.kt
index 83d3540017..e8b8a39405 100644
--- a/app/src/main/java/com/gh/common/view/ImageContainerView.kt
+++ b/app/src/main/java/com/gh/common/view/ImageContainerView.kt
@@ -215,6 +215,7 @@ class ImageContainerView : LinearLayout {
         }
 
         if (url.endsWith(".gif")) {
+            binding.gifBorder.visibility = View.VISIBLE
             binding.labelIcon.visibility = View.VISIBLE
             binding.labelIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_gif_label))
         }
diff --git a/app/src/main/res/layout/item_community_image.xml b/app/src/main/res/layout/item_community_image.xml
index 06fc58cb9a..45314821e3 100644
--- a/app/src/main/res/layout/item_community_image.xml
+++ b/app/src/main/res/layout/item_community_image.xml
@@ -16,18 +16,30 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/image"
-            style="@style/frescoStyle"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:roundingBorderWidth="1px"
-            app:roundingBorderColor="@color/black_alpha_5"
-            app:roundedCornerRadius="4dp" />
+            android:layout_height="match_parent">
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id="@+id/image"
+                style="@style/frescoStyle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:roundingBorderWidth="1dp"
+                app:roundingBorderColor="@color/black_alpha_5"
+                app:roundedCornerRadius="4dp" />
+
+            <View
+                android:visibility="gone"
+                android:id="@+id/gifBorder"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/bg_forum_image_border" />
+        </RelativeLayout>
     </androidx.cardview.widget.CardView>