diff --git a/dist/filament-lms.css b/dist/filament-lms.css
index b589c88..1210eb4 100644
--- a/dist/filament-lms.css
+++ b/dist/filament-lms.css
@@ -22,8 +22,9 @@
 
 /* Centralized step material sizing */
 .step-material-container {
+    width: 100%;
     height: 60vh;
-    max-width: calc(60vh * 16/9);
+    max-width: min(100%, calc(60vh * 16 / 9));
     margin: 0 auto;
 }
 
@@ -175,3 +176,71 @@ body.lms-embedded-player .fi-main {
     font-size: 0.9375rem;
     line-height: 1.45;
 }
+
+[x-cloak] {
+    display: none !important;
+}
+
+.lms-image-preview__trigger {
+    display: block;
+    width: 100%;
+    padding: 0;
+    border: 0;
+    background: transparent;
+    cursor: zoom-in;
+    text-align: inherit;
+}
+
+.lms-image-preview__hint {
+    display: block;
+    margin-top: 0.5rem;
+    font-size: 0.875rem;
+    color: rgb(107 114 128);
+    text-align: center;
+}
+
+.lms-image-lightbox {
+    position: fixed;
+    inset: 0;
+    z-index: 80;
+    background: rgb(15 23 42 / 0.92);
+}
+
+.lms-image-lightbox__close {
+    position: fixed;
+    top: 1rem;
+    right: 1rem;
+    z-index: 81;
+    padding: 0.5rem 0.875rem;
+    border: 0;
+    border-radius: 0.5rem;
+    background: rgb(255 255 255);
+    color: rgb(15 23 42);
+    font-size: 0.875rem;
+    font-weight: 600;
+    cursor: pointer;
+}
+
+.lms-image-lightbox__scroller {
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    touch-action: pan-x pan-y pinch-zoom;
+    -webkit-overflow-scrolling: touch;
+}
+
+.lms-image-lightbox__scroller img {
+    display: block;
+    width: auto;
+    height: auto;
+    max-width: none;
+    margin: 2.5rem auto;
+}
+
+body.lms-image-lightbox-open {
+    overflow: hidden;
+}
+
+body.lms-image-lightbox-open .next-button {
+    visibility: hidden;
+}
diff --git a/resources/css/plugin.css b/resources/css/plugin.css
index b589c88..1210eb4 100644
--- a/resources/css/plugin.css
+++ b/resources/css/plugin.css
@@ -22,8 +22,9 @@
 
 /* Centralized step material sizing */
 .step-material-container {
+    width: 100%;
     height: 60vh;
-    max-width: calc(60vh * 16/9);
+    max-width: min(100%, calc(60vh * 16 / 9));
     margin: 0 auto;
 }
 
@@ -175,3 +176,71 @@ body.lms-embedded-player .fi-main {
     font-size: 0.9375rem;
     line-height: 1.45;
 }
+
+[x-cloak] {
+    display: none !important;
+}
+
+.lms-image-preview__trigger {
+    display: block;
+    width: 100%;
+    padding: 0;
+    border: 0;
+    background: transparent;
+    cursor: zoom-in;
+    text-align: inherit;
+}
+
+.lms-image-preview__hint {
+    display: block;
+    margin-top: 0.5rem;
+    font-size: 0.875rem;
+    color: rgb(107 114 128);
+    text-align: center;
+}
+
+.lms-image-lightbox {
+    position: fixed;
+    inset: 0;
+    z-index: 80;
+    background: rgb(15 23 42 / 0.92);
+}
+
+.lms-image-lightbox__close {
+    position: fixed;
+    top: 1rem;
+    right: 1rem;
+    z-index: 81;
+    padding: 0.5rem 0.875rem;
+    border: 0;
+    border-radius: 0.5rem;
+    background: rgb(255 255 255);
+    color: rgb(15 23 42);
+    font-size: 0.875rem;
+    font-weight: 600;
+    cursor: pointer;
+}
+
+.lms-image-lightbox__scroller {
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    touch-action: pan-x pan-y pinch-zoom;
+    -webkit-overflow-scrolling: touch;
+}
+
+.lms-image-lightbox__scroller img {
+    display: block;
+    width: auto;
+    height: auto;
+    max-width: none;
+    margin: 2.5rem auto;
+}
+
+body.lms-image-lightbox-open {
+    overflow: hidden;
+}
+
+body.lms-image-lightbox-open .next-button {
+    visibility: hidden;
+}
diff --git a/resources/views/livewire/document-step.blade.php b/resources/views/livewire/document-step.blade.php
index 678f48d..1c80851 100644
--- a/resources/views/livewire/document-step.blade.php
+++ b/resources/views/livewire/document-step.blade.php
@@ -4,12 +4,14 @@ class="flex-1 flex flex-col"
         >
             <div class="mb-8 flex-1">
                 @if($this->getPreviewImage())
-                    <img 
-                        src="{{ $this->getPreviewImage() }}" 
-                        alt="Document Preview Image" 
-                        class="step-material-container rounded-lg border border-gray-300 cursor-pointer"
-                        wire:click="download"
-                    />
+                    <div class="step-material-container">
+                        <img
+                            src="{{ $this->getPreviewImage() }}"
+                            alt="Document Preview Image"
+                            class="rounded-lg border border-gray-300 cursor-pointer"
+                            wire:click="download"
+                        />
+                    </div>
                 @elseif ($document->hasScormPackage())
                     <div class="step-material-container step-material-container--interactive w-full">
                         <iframe
diff --git a/resources/views/livewire/image-step.blade.php b/resources/views/livewire/image-step.blade.php
index b21ed59..9f63205 100644
--- a/resources/views/livewire/image-step.blade.php
+++ b/resources/views/livewire/image-step.blade.php
@@ -4,14 +4,57 @@ class="flex-1 flex flex-col"
     >
         <div class="mb-8 flex-1">
             @if($this->getImageUrl())
-                <img 
-                    src="{{ $this->getImageUrl() }}" 
-                    class="step-material-container rounded-lg border border-gray-300"
-                    alt="Step Image"
-                />
+                <div
+                    class="lms-image-preview"
+                    x-data="{ open: false }"
+                    x-effect="document.body.classList.toggle('lms-image-lightbox-open', open)"
+                    @keydown.escape.window="open = false"
+                >
+                    <button
+                        type="button"
+                        class="lms-image-preview__trigger"
+                        @click="open = true; $nextTick(() => $refs.closeBtn?.focus())"
+                        aria-label="View larger image"
+                    >
+                        <div class="step-material-container">
+                            <img
+                                src="{{ $this->getImageUrl() }}"
+                                class="rounded-lg border border-gray-300"
+                                alt="Step Image"
+                            />
+                        </div>
+                        <span class="lms-image-preview__hint">Tap to zoom</span>
+                    </button>
+
+                    <div
+                        x-show="open"
+                        x-cloak
+                        class="lms-image-lightbox"
+                        role="dialog"
+                        aria-modal="true"
+                        aria-label="Image preview"
+                        @click.self="open = false"
+                    >
+                        <button
+                            type="button"
+                            class="lms-image-lightbox__close"
+                            x-ref="closeBtn"
+                            @click="open = false"
+                            aria-label="Close image preview"
+                        >
+                            Close
+                        </button>
+                        <div class="lms-image-lightbox__scroller">
+                            <img
+                                src="{{ $this->getImageUrl() }}"
+                                alt="Step Image"
+                            />
+                        </div>
+                    </div>
+                </div>
             @endif
         </div>
     </x-filament::section>
 
     <x-filament-lms::next-button />
-</div> 
+</div>
diff --git a/tests/Feature/ImageStepTest.php b/tests/Feature/ImageStepTest.php
new file mode 100644
index 0000000..9226373
--- /dev/null
+++ b/tests/Feature/ImageStepTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Tapp\FilamentLms\Tests\Feature;
+
+use Illuminate\Contracts\Support\MessageBag as MessageBagContract;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\MessageBag;
+use Livewire\Livewire;
+use Tapp\FilamentLms\Livewire\ImageStep;
+use Tapp\FilamentLms\Models\Course;
+use Tapp\FilamentLms\Models\Image;
+use Tapp\FilamentLms\Models\Lesson;
+use Tapp\FilamentLms\Models\Step;
+use Tapp\FilamentLms\Tests\TestUser;
+
+class ImageStepWithErrorBag extends ImageStep
+{
+    public function getErrorBag(): MessageBagContract
+    {
+        return new MessageBag;
+    }
+}
+
+beforeEach(function () {
+    if (! Schema::hasColumn('lms_images', 'deleted_at')) {
+        Schema::table('lms_images', function (Blueprint $table) {
+            $table->softDeletes();
+        });
+    }
+});
+
+test('image step wraps the image in the material container', function () {
+    $user = TestUser::create([
+        'name' => 'Test User',
+        'email' => 'image-step@example.com',
+        'password' => bcrypt('password'),
+    ]);
+
+    $this->actingAs($user);
+
+    $course = Course::factory()->create();
+    $lesson = Lesson::factory()->create(['course_id' => $course->id]);
+
+    $image = Image::query()->create([
+        'name' => 'Landscape',
+        'file_path' => 'images/landscape.png',
+    ]);
+
+    $path = sys_get_temp_dir().'/lms-landscape-test.png';
+    $png = imagecreatetruecolor(16, 9);
+    imagepng($png, $path);
+
+    $image->addMedia($path)->preservingOriginal()->toMediaCollection('image');
+
+    $step = Step::factory()->create([
+        'lesson_id' => $lesson->id,
+        'name' => 'Landscape Image',
+        'slug' => 'landscape-image',
+        'material_type' => 'image',
+        'material_id' => $image->id,
+    ]);
+
+    $html = Livewire::test(ImageStepWithErrorBag::class, ['step' => $step->fresh(['material'])])->html();
+
+    expect($html)
+        ->toContain('class="step-material-container"')
+        ->toContain('<img')
+        ->toContain('role="dialog"')
+        ->toContain('Tap to zoom')
+        ->not->toContain('class="step-material-container rounded-lg');
+});