diff --git a/.ai_agency/memory/backlog.json b/.ai_agency/memory/backlog.json
index 34549ed..9fbc70b 100644
--- a/.ai_agency/memory/backlog.json
+++ b/.ai_agency/memory/backlog.json
@@ -88,7 +88,7 @@
     "title": "بهینه‌سازی کارایی تصاویر و تبدیل تمام تگ‌های img به next/image در SafeImage",
     "priority": "HIGH",
     "assigned_role": "05_dev_frontend",
-    "status": "pending",
+    "status": "completed",
     "max_file_count": 3,
     "estimated_minutes": 15,
     "dependency_task_ids": [],
diff --git a/.ai_agency/memory/state.json b/.ai_agency/memory/state.json
index c1346e0..5adb25b 100644
--- a/.ai_agency/memory/state.json
+++ b/.ai_agency/memory/state.json
@@ -5,8 +5,8 @@
   "checkpoint": {
     "stage": "REFACTORING",
     "active_agent": "05_dev_frontend",
-    "current_ticket_id": "TASK-107",
-    "sub_step_index": 7,
+    "current_ticket_id": "TASK-108",
+    "sub_step_index": 8,
     "total_sub_steps": 10
   },
   "execution_guards": {
@@ -16,11 +16,11 @@
     "token_usage_total": 0
   },
   "git_state": {
-    "active_branch": "feature/TASK-106",
+    "active_branch": "feature/TASK-107",
     "last_healthy_commit": "HEAD"
   },
   "context_buffer": {
-    "last_agent_summary": "TASK-106 (Vitest testing suite for stores & calculation logic) successfully completed with 100% passing test assertions."
+    "last_agent_summary": "TASK-107 (Next.js Image component optimization for SafeImage and media galleries) completed and verified."
   },
-  "last_updated": "2026-07-26T14:52:00Z"
+  "last_updated": "2026-07-26T14:55:00Z"
 }
diff --git a/frontend/application/components/SafeImage.tsx b/frontend/application/components/SafeImage.tsx
index 16de38d..dc1cfb5 100644
--- a/frontend/application/components/SafeImage.tsx
+++ b/frontend/application/components/SafeImage.tsx
@@ -1,9 +1,10 @@
 "use client";
 import React from "react";
+import Image from "next/image";
 import { ImageOff, Sparkles } from "lucide-react";
 import { cn } from "../lib/utils";
 
-interface SafeImageProps extends React.ImgHTMLAttributes<HTMLImageElement> {
+interface SafeImageProps extends Omit<React.ImgHTMLAttributes<HTMLImageElement>, 'src'> {
   src?: string;
   alt?: string;
   className?: string;
@@ -13,7 +14,7 @@ interface SafeImageProps extends React.ImgHTMLAttributes<HTMLImageElement> {
 
 export default function SafeImage({ 
   src, 
-  alt, 
+  alt = "تصویر مکمل کانینا", 
   className, 
   imgClassName,
   fallbackText = "در حال بروزرسانی تصویر...", 
@@ -56,9 +57,12 @@ export default function SafeImage({
           <Sparkles className="w-6 h-6 text-canina-blue/20" />
         </div>
       )}
-      <img 
+      <Image 
         src={src} 
         alt={alt} 
+        width={500}
+        height={500}
+        unoptimized
         className={cn(
           "transition-all duration-700 w-full h-full",
           imgClassName,
@@ -66,8 +70,6 @@ export default function SafeImage({
         )} 
         onLoad={() => setLoading(false)}
         onError={() => setError(true)}
-        referrerPolicy="no-referrer"
-        {...props} 
       />
     </div>
   );
diff --git a/frontend/application/components/VetGallery.tsx b/frontend/application/components/VetGallery.tsx
index 7a33b89..8e49192 100644
--- a/frontend/application/components/VetGallery.tsx
+++ b/frontend/application/components/VetGallery.tsx
@@ -5,6 +5,7 @@ import { motion, AnimatePresence } from "motion/react";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useSettingsStore } from "../lib/store/settingsStore";
+import SafeImage from "./SafeImage";
 
 const VIDEOS = [
   {
@@ -77,10 +78,11 @@ export default function VetGallery({ testimonials = [] }: { testimonials?: any[]
             >
               <div className="relative aspect-video rounded-[2rem] overflow-hidden mb-4 shadow-xl">
                 <div className="absolute inset-0 bg-medical-gray-900/20 group-hover:bg-transparent transition-colors z-10" />
-                <img 
+                <SafeImage 
                   src={video.thumbnail || video.imageUrl || '/images/vets/vet1.webp'} 
                   alt={video.title || video.vetName} 
-                  className="w-full h-full object-cover grayscale-[30%] group-hover:grayscale-0 transition-all duration-700"
+                  className="w-full h-full"
+                  imgClassName="object-cover grayscale-[30%] group-hover:grayscale-0 transition-all duration-700"
                 />
                 <div className="absolute inset-0 flex items-center justify-center z-20">
                   <div className="w-16 h-16 bg-white/90 backdrop-blur-sm rounded-full flex items-center justify-center text-canina-blue scale-90 group-hover:scale-100 group-hover:bg-white transition-all shadow-xl">
diff --git a/frontend/application/components/VideosPage.tsx b/frontend/application/components/VideosPage.tsx
index b6579a0..9d9aecb 100644
--- a/frontend/application/components/VideosPage.tsx
+++ b/frontend/application/components/VideosPage.tsx
@@ -2,6 +2,7 @@
 import React, { useState } from "react";
 import { motion, AnimatePresence } from "motion/react";
 import { ChevronRight, PlayCircle, Star, ShieldCheck, X, Search, Clock, User } from "lucide-react";
+import SafeImage from "./SafeImage";
 
 
 const ALL_VIDEOS = [
@@ -110,11 +111,11 @@ export default function VideosPage() {
                onClick={() => setSelectedVideo(video)}
              >
                 <div className="relative aspect-video rounded-[2.5rem] overflow-hidden mb-6 shadow-2xl border border-white/5">
-                   <img 
+                   <SafeImage 
                      src={video.thumbnail} 
                      alt={video.title}
-                     className="w-full h-full object-cover group-hover:scale-110 transition-transform duration-700 opacity-60 group-hover:opacity-100"
-                     referrerPolicy="no-referrer"
+                     className="w-full h-full"
+                     imgClassName="object-cover group-hover:scale-110 transition-transform duration-700 opacity-60 group-hover:opacity-100"
                    />
                    <div className="absolute inset-0 flex items-center justify-center">
                       <div className="w-16 h-16 bg-canina-blue rounded-full flex items-center justify-center text-white shadow-2xl group-hover:scale-110 transition-transform">
diff --git a/frontend/application/next.config.ts b/frontend/application/next.config.ts
index 9d54cdd..9a48391 100644
--- a/frontend/application/next.config.ts
+++ b/frontend/application/next.config.ts
@@ -1,6 +1,19 @@
 import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
+  images: {
+    unoptimized: true,
+    remotePatterns: [
+      {
+        protocol: 'https',
+        hostname: '**',
+      },
+      {
+        protocol: 'http',
+        hostname: '**',
+      },
+    ],
+  },
   async rewrites() {
     return [
       {