diff --git a/src/components/ImageWithPreview.tsx b/src/components/ImageWithPreview.tsx
index da677302..76490e9a 100644
--- a/src/components/ImageWithPreview.tsx
+++ b/src/components/ImageWithPreview.tsx
@@ -1,17 +1,60 @@
 import RcImage, { ImageProps } from 'rc-image';
+import { useEffect, useState } from 'react';
 import { AiOutlineClose } from 'react-icons/ai';
 
 import 'rc-image/assets/index.css';
 
+import GifPlayButton from './loading/GifPlayButton';
+
 const ImageWithPreview = (props: ImageProps) => {
+  const [imgSrc, setImgSrc] = useState(
+    props.src?.endsWith('gif') ? `${props.src}!gif` : (props.src as string)
+  );
+  const isGifThumb = imgSrc.endsWith('!gif');
+  const isGif = imgSrc?.endsWith('gif') && !isGifThumb;
+  const sourceIsGif = props.src?.endsWith('gif');
+
+  useEffect(() => {
+    if (props.src?.endsWith('gif')) {
+      setImgSrc(`${props.src}!gif`);
+    } else {
+      setImgSrc(props.src as string);
+    }
+  }, [props.src]);
+
+  const handleLoadGif = (e: any) => {
+    e.stopPropagation();
+    setTimeout(() => {
+      if (sourceIsGif) {
+        setImgSrc(imgSrc?.replace('!gif', ''));
+      }
+    }, 300);
+  };
+
   return (
-    <RcImage
-      {...props}
-      preview={{
-        icons: { close: <AiOutlineClose style={{ fontSize: 13 }} /> },
-        toolbarRender: () => <></>,
-      }}
-    />
+    <div style={{ position: 'relative' }}>
+      <RcImage
+        {...props}
+        src={imgSrc}
+        style={{ opacity: isGifThumb ? '0.9' : '1' }}
+        preview={{
+          icons: { close: <AiOutlineClose style={{ fontSize: 13 }} /> },
+          toolbarRender: () => <></>,
+        }}
+      />
+      {sourceIsGif && (
+        <div className='absolute top-0 left-0 h-full w-full opacity-100'>
+          <div
+            onClick={handleLoadGif}
+            className={`flex h-full cursor-pointer items-center justify-center transition-all duration-300 ${
+              isGif ? 'scale-75 opacity-0' : 'scale-100 opacity-100'
+            }`}
+          >
+            <GifPlayButton />
+          </div>
+        </div>
+      )}
+    </div>
   );
 };
 
diff --git a/src/components/loading/GifPlayButton.tsx b/src/components/loading/GifPlayButton.tsx
new file mode 100644
index 00000000..28152437
--- /dev/null
+++ b/src/components/loading/GifPlayButton.tsx
@@ -0,0 +1,40 @@
+// GifPlayButton.tsx
+import React from 'react';
+
+const GifPlayButton = () => (
+  <svg
+    width='50'
+    height='50'
+    viewBox='0 0 60 60'
+    xmlns='http://www.w3.org/2000/svg'
+  >
+    <g stroke='none' strokeWidth='1' fill='none' fillRule='evenodd'>
+      <ellipse
+        fill='#000'
+        opacity='0.45'
+        cx='30'
+        cy='30'
+        rx='30'
+        ry='30'
+      ></ellipse>
+      <ellipse
+        stroke='#FFF'
+        strokeWidth='2'
+        strokeLinecap='round'
+        strokeLinejoin='round'
+        opacity='0.5'
+        cx='30'
+        cy='30'
+        rx='26'
+        ry='26'
+      ></ellipse>
+    </g>
+    <svg x='16' y='18.5'>
+      <g fill='#fff'>
+        <path d='M12.8422852,12.9814453 L12.8422852,11.3994141 L7.63916016,11.3994141 L7.63916016,13.0517578 L10.9086914,13.0517578 L10.9086914,13.3242188 C10.8911133,15.2050781 9.46728516,16.4707031 7.39306641,16.4707031 C5.01123047,16.4707031 3.51708984,14.625 3.51708984,11.6367188 C3.51708984,8.70117188 5.00244141,6.84667969 7.34912109,6.84667969 C9.08056641,6.84667969 10.284668,7.68164062 10.7768555,9.2109375 L12.7543945,9.2109375 C12.3237305,6.64453125 10.2319336,5.00976562 7.34912109,5.00976562 C3.79833984,5.00976562 1.50439453,7.61132812 1.50439453,11.6542969 C1.50439453,15.75 3.77197266,18.3076172 7.36669922,18.3076172 C10.6889648,18.3076172 12.8422852,16.2246094 12.8422852,12.9814453 Z M17.5180664,18 L17.5180664,5.31738281 L15.5493164,5.31738281 L15.5493164,18 L17.5180664,18 Z M22.659668,18 L22.659668,12.7441406 L28.1088867,12.7441406 L28.1088867,11.0039062 L22.659668,11.0039062 L22.659668,7.11035156 L28.6098633,7.11035156 L28.6098633,5.31738281 L20.690918,5.31738281 L20.690918,18 L22.659668,18 Z'></path>
+      </g>
+    </svg>
+  </svg>
+);
+
+export default GifPlayButton;