From 6af270dd7fe6fcb2e953256081860707dd07b977 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Thu, 23 Jul 2026 14:14:55 +0200
Subject: [PATCH 01/12] Set title of modal to image title

---
 src/views/compress-details.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/views/compress-details.php b/src/views/compress-details.php
index 7c3152f9..a41eb531 100644
--- a/src/views/compress-details.php
+++ b/src/views/compress-details.php
@@ -111,8 +111,11 @@
 				<?php echo esc_html__( 'Latest error', 'tiny-compress-images' ) . ': ' . esc_html( $error ); ?>
 			</span>
 			<br>
-		<?php } ?>
-		<a class="thickbox message" href="#TB_inline?width=700&amp;height=500&amp;inlineId=modal_<?php echo absint( $tiny_image->get_id() ); ?>">
+		<?php } 
+		/* translators: %s is the image filename */
+		$modal_title = sprintf(esc_html__( 'Compression details for %s', 'tiny-compress-images' ), esc_html( $tiny_image->get_name() ));
+		?>
+		<a class="thickbox message" name="<?php echo esc_attr($modal_title); ?>" href="#TB_inline?width=700&amp;height=500&amp;inlineId=modal_<?php echo absint( $tiny_image->get_id() ); ?>">
 			<?php esc_html_e( 'Details', 'tiny-compress-images' ); ?>
 		</a>
 	</div>
@@ -138,12 +141,6 @@
 
 <div class="modal" id="modal_<?php echo absint( $tiny_image->get_id() ); ?>">
 	<div class="tiny-compression-details">
-		<h3>
-			<?php
-			/* translators: %s is the image filename */
-			printf( esc_html__( 'Compression details for %s', 'tiny-compress-images' ), esc_html( $tiny_image->get_name() ) );
-			?>
-		</h3>
 		<table>
 			<tr>
 				<th><?php esc_html_e( 'Size', 'tiny-compress-images' ); ?></th>

From 86e8030957ff57d85ed8e4f647b5b233e1d63dab Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Thu, 23 Jul 2026 14:54:33 +0200
Subject: [PATCH 02/12] move backup func to image

---
 src/class-tiny-image.php  | 95 +++++++++++++++++++++++++++++++++++++++
 src/class-tiny-plugin.php | 32 +------------
 2 files changed, 96 insertions(+), 31 deletions(-)

diff --git a/src/class-tiny-image.php b/src/class-tiny-image.php
index 4b349eab..9f693d3b 100644
--- a/src/class-tiny-image.php
+++ b/src/class-tiny-image.php
@@ -675,4 +675,99 @@ public function mark_as_compressed() {
 
 		$this->update_tiny_post_meta();
 	}
+
+	/**
+	 * Retrieves the original image of the Tiny_Image
+	 * 
+	 *
+	 * @return Tiny_Image_Size|false the image or false if does not exist
+	 */
+	private function get_original_image() {
+		$original_image = $this->get_image_size( Tiny_Image::ORIGINAL_UNSCALED );
+		if ( null === $original_image ) {
+			$original_image = $this->get_image_size();
+		}
+
+		if ( null === $original_image ) {
+			return false;
+		}
+
+		return $original_image;
+	}
+
+	/**
+	 * Builds the filesystem path where the backup of the original image is
+	 * (or would be) stored.
+	 *
+	 * @return string|false the backup file path, or false if there is no original image
+	 */
+	private function get_backup_path() {
+		$original_image = $this->get_original_image();
+		if ( false === $original_image ) {
+			return false;
+		}
+
+		$file_path  = $original_image->filename;
+		$upload_dir = wp_upload_dir();
+		$basedir    = trailingslashit( $upload_dir['basedir'] );
+		if ( Tiny_Helpers::str_starts_with( $file_path, $basedir ) ) {
+			$file_path = substr( $file_path, strlen( $basedir ) );
+		}
+
+		return $basedir . 'tinify_backup/' . $file_path;
+	}
+
+	/**
+	 * Creates a backup copy of the original image, if one does not already exist.
+	 *
+	 * @return bool true on success, false on failure or if a backup already exists
+	 */
+	public function create_backup() {
+
+		$backup_file_path = $this->get_backup_path();
+		if ( false === $backup_file_path ) {
+			return false;
+		}
+
+		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+
+		if ( $wp_filesystem->exists( $backup_file_path ) ) {
+			return false;
+		}
+
+		$backup_dir = dirname( $backup_file_path );
+
+		if ( ! wp_mkdir_p( $backup_dir ) ) {
+			return false;
+		}
+
+		$original_image = $this->get_original_image();
+
+		return $wp_filesystem->copy( $original_image->filename, $backup_file_path );
+	}
+
+	
+	/**
+	 * Retrieves the public URL of the backup of the original image.
+	 *
+	 * @return string|false the backup URL, or false if no backup exists
+	 */
+	public function get_backup() {
+		$backup_file_path = $this->get_backup_path();
+		if ( false === $backup_file_path ) {
+			return false;
+		}
+
+		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+
+		if ( ! $wp_filesystem->exists( $backup_file_path ) ) {
+			return false;
+		}
+
+		$upload_dir = wp_upload_dir();
+		$basedir    = trailingslashit( $upload_dir['basedir'] );
+		$baseurl    = trailingslashit( $upload_dir['baseurl'] );
+
+		return str_replace( $basedir, $baseurl, $backup_file_path );
+	}
 }
diff --git a/src/class-tiny-plugin.php b/src/class-tiny-plugin.php
index a96b9f4f..1bf64fbe 100644
--- a/src/class-tiny-plugin.php
+++ b/src/class-tiny-plugin.php
@@ -934,37 +934,7 @@ public function backup_original_image( $attachment_id ) {
 
 		$tiny_image = new Tiny_Image( $this->settings, $attachment_id );
 
-		$original_image = $tiny_image->get_image_size( Tiny_Image::ORIGINAL_UNSCALED );
-		if ( null === $original_image ) {
-			$original_image = $tiny_image->get_image_size();
-		}
-
-		if ( null === $original_image ) {
-			return false;
-		}
-
-		$file_path  = $original_image->filename;
-		$upload_dir = wp_upload_dir();
-		$basedir    = trailingslashit( $upload_dir['basedir'] );
-		if ( Tiny_Helpers::str_starts_with( $file_path, $basedir ) ) {
-			$file_path = substr( $file_path, strlen( $basedir ) );
-		}
-
-		$backup_file = $basedir . 'tinify_backup/' . $file_path;
-
-		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
-
-		if ( $wp_filesystem->exists( $backup_file ) ) {
-			return false;
-		}
-
-		$backup_dir = dirname( $backup_file );
-
-		if ( ! wp_mkdir_p( $backup_dir ) ) {
-			return false;
-		}
-
-		return $wp_filesystem->copy( $original_image->filename, $backup_file );
+		return $tiny_image->create_backup();
 	}
 
 	public static function request_review() {

From 88bc995898f6f9ed23f639e0237f7096f5e87484 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Thu, 23 Jul 2026 14:54:52 +0200
Subject: [PATCH 03/12] show backup info and actions on details modal

---
 src/views/compress-details-backup.php | 45 +++++++++++++++++++++++++++
 src/views/compress-details.php        |  2 ++
 2 files changed, 47 insertions(+)
 create mode 100644 src/views/compress-details-backup.php

diff --git a/src/views/compress-details-backup.php b/src/views/compress-details-backup.php
new file mode 100644
index 00000000..fe6812a6
--- /dev/null
+++ b/src/views/compress-details-backup.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Details on the backup of the image
+ *
+ * @var Tiny_Plugin $this               The plugin instance.
+ * @var Tiny_Image  $tiny_image         The image being compressed.
+ * @var int[]       $images_to_compress The IDs that are being compressed
+ */
+
+$available_sizes              = array_keys( $this->settings->get_sizes() );
+$conversion_enabled           = $this->settings->get_conversion_enabled();
+$active_sizes                 = $this->settings->get_sizes();
+$backup_enabled				  = $this->settings->get_backup_enabled();
+$active_tinify_sizes          = $this->settings->get_active_tinify_sizes();
+$error                        = $tiny_image->get_latest_error();
+$total                        = $tiny_image->get_count( array( 'modified', 'missing', 'has_been_compressed', 'compressed', 'has_been_converted' ) );
+$active                       = $tiny_image->get_count( array( 'uncompressed', 'never_compressed', 'unconverted' ), $active_tinify_sizes );
+$image_statistics             = $tiny_image->get_statistics( $active_sizes, $active_tinify_sizes );
+$available_uncompressed_sizes = $image_statistics['available_uncompressed_sizes'];
+$size_before                  = $image_statistics['initial_total_size'];
+$size_after                   = $image_statistics['compressed_total_size'];
+
+$size_active = array_fill_keys( $active_tinify_sizes, true );
+$size_exists = array_fill_keys( $available_sizes, true );
+ksort( $size_exists );
+
+?>
+<?php if ($backup_enabled) {
+	$backup = $tiny_image->get_backup();
+?>
+	<p>
+		<?php if ($backup) { ?>
+			<a href="<?php echo esc_attr( $backup ); ?>" target="_blank">
+				<?php esc_html_e('View Uncompressed'); ?>
+			</a>
+			<a href="">
+				<?php esc_html_e('Restore Backup', 'tiny-compress-images'); ?>
+			</a>
+		<?php } else { ?>
+			<span>
+				<?php esc_html_e('No backup available', 'tiny-compress-images'); ?>
+			</span>
+		<?php } ?>
+	</p>
+<?php } ?>
\ No newline at end of file
diff --git a/src/views/compress-details.php b/src/views/compress-details.php
index a41eb531..1f455296 100644
--- a/src/views/compress-details.php
+++ b/src/views/compress-details.php
@@ -10,6 +10,7 @@
 $available_sizes              = array_keys( $this->settings->get_sizes() );
 $conversion_enabled           = $this->settings->get_conversion_enabled();
 $active_sizes                 = $this->settings->get_sizes();
+$backup_enabled				  = $this->settings->get_backup_enabled();
 $active_tinify_sizes          = $this->settings->get_active_tinify_sizes();
 $error                        = $tiny_image->get_latest_error();
 $total                        = $tiny_image->get_count( array( 'modified', 'missing', 'has_been_compressed', 'compressed', 'has_been_converted' ) );
@@ -255,5 +256,6 @@
 				?>
 			</strong>
 		</p>
+		<?php include __DIR__ . '/compress-details-backup.php'; ?>
 	</div>
 </div>

From 7a90ef73adb436866530307f9198babdfafe4eb0 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Thu, 23 Jul 2026 14:55:01 +0200
Subject: [PATCH 04/12] tiny ui fix

---
 src/css/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/css/admin.css b/src/css/admin.css
index 977dadf1..33bbcce5 100644
--- a/src/css/admin.css
+++ b/src/css/admin.css
@@ -412,7 +412,7 @@ input[type=number][name*="tinypng_resize_original"] {
 }
 
 .tiny-compression-details {
-	padding: 10px;
+	padding: 10px 0;
 }
 
 .tiny-compression-details table {

From 8fc55648681664b6a2a396c5285e52cbfda18603 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Fri, 24 Jul 2026 10:33:18 +0200
Subject: [PATCH 05/12] add ajax action for restoring

---
 src/class-tiny-image.php  | 53 +++++++++++++++++++++++++++++++++++++++
 src/class-tiny-plugin.php | 31 +++++++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/src/class-tiny-image.php b/src/class-tiny-image.php
index 9f693d3b..253fa760 100644
--- a/src/class-tiny-image.php
+++ b/src/class-tiny-image.php
@@ -770,4 +770,57 @@ public function get_backup() {
 
 		return str_replace( $basedir, $baseurl, $backup_file_path );
 	}
+
+	/**
+	 * Restores the original image from its backup.
+	 *
+	 * - Copies the backup file over the current original
+	 * - clears compression metadata 
+	 * - updates the WordPress attachment metadata
+	 *
+	 * @since 3.7.0
+	 *
+	 * @return bool True on success, false if no backup exists or the copy fails.
+	 */
+	public function restore_backup() {
+		$backup_file_path = $this->get_backup_path();
+		if ( false === $backup_file_path ) {
+			return false;
+		}
+
+		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+
+		if ( ! $wp_filesystem->exists( $backup_file_path ) ) {
+			return false;
+		}
+
+		$original_size_key = null !== $this->get_image_size( self::ORIGINAL_UNSCALED )
+			? self::ORIGINAL_UNSCALED
+			: self::ORIGINAL;
+
+		$original_image = $this->get_image_size( $original_size_key );
+		if ( null === $original_image ) {
+			return false;
+		}
+
+		if ( ! $wp_filesystem->copy( $backup_file_path, $original_image->filename, true ) ) {
+			return false;
+		}
+
+		$original_image->meta = array();
+		$this->update_tiny_post_meta();
+
+		// only on non-unscaled, as resize can be turned on
+		if ( self::is_original( $original_size_key ) ) {
+			$image_size = wp_getimagesize( $original_image->filename );
+			if ( $image_size ) {
+				$this->wp_metadata['width']    = $image_size[0];
+				$this->wp_metadata['height']   = $image_size[1];
+				$this->wp_metadata['filesize'] = filesize( $original_image->filename );
+				wp_update_attachment_metadata( $this->id, $this->wp_metadata );
+			}
+		}
+
+		return true;
+	}
 }
diff --git a/src/class-tiny-plugin.php b/src/class-tiny-plugin.php
index 1bf64fbe..09676fc7 100644
--- a/src/class-tiny-plugin.php
+++ b/src/class-tiny-plugin.php
@@ -119,6 +119,11 @@ public function ajax_init() {
 			$this->get_method( 'mark_image_as_compressed' )
 		);
 
+		add_action(
+			'wp_ajax_tiny_restore_backup',
+			$this->get_method( 'restore_backup_image' )
+		);
+
 		/*
 		When touching any functionality linked to image compressions when
 			uploading images make sure it also works with XML-RPC. See README. */
@@ -959,6 +964,32 @@ public static function uninstall() {
 		Tiny_Apache_Rewrite::uninstall_rules();
 	}
 
+	/**
+	 * Restores the original image from its backup via AJAX.
+	 *
+	 * Validates the request, calls restore_backup() on the image, then
+	 * re-renders the compression details partial in the response.
+	 *
+	 * @since 3.7.0
+	 *
+	 * @return void
+	 */
+	public function restore_backup_image() {
+		$response = $this->validate_ajax_attachment_request();
+		if ( isset( $response['error'] ) ) {
+			echo esc_html( $response['error'] );
+			exit();
+		}
+
+		list($id, $metadata) = $response['data'];
+		$tiny_image          = new Tiny_Image( $this->settings, $id, $metadata );
+		$tiny_image->restore_backup();
+
+		$this->render_compress_details( $tiny_image );
+
+		exit();
+	}
+
 	public function mark_image_as_compressed() {
 		$response = $this->validate_ajax_attachment_request();
 		if ( isset( $response['error'] ) ) {

From 38e00293641e1532c74a54277a291ecb9502b355 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Fri, 24 Jul 2026 10:35:03 +0200
Subject: [PATCH 06/12] restore backup js

---
 src/js/admin.js | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/js/admin.js b/src/js/admin.js
index 03312c0a..deba76f5 100644
--- a/src/js/admin.js
+++ b/src/js/admin.js
@@ -1,4 +1,48 @@
-(function() {
+(function () {
+  function restoreBackup(attachmentId, container) {
+    jQuery.ajax({
+      url: ajaxurl,
+      type: 'POST',
+      data: {
+        _nonce: tinyCompress.nonce,
+        action: 'tiny_restore_backup',
+        id: attachmentId,
+      },
+      success: function (data) {
+        container.html(data);
+      },
+    });
+  }
+
+  jQuery(document).on('click', 'a[data-dialog-id]', function (e) {
+    e.preventDefault();
+    const trigger = jQuery(e.currentTarget);
+    const dialogID = trigger.data('dialog-id');
+    if (!dialogID) {
+      return;
+    }
+
+    const dialog = document.getElementById(dialogID);
+    if (!dialog) {
+      return;
+    }
+
+    const attachmentId = trigger.data('id');
+    const container = jQuery('#modal_' + attachmentId).closest('.tiny-ajax-container');
+
+    dialog.showModal();
+
+    dialog.addEventListener('close', function onClose() {
+      dialog.removeEventListener('close', onClose);
+      if (dialog.returnValue === 'confirm') {
+        if (typeof tb_remove === 'function') {
+          tb_remove();
+        }
+        restoreBackup(attachmentId, container);
+      }
+    });
+  });
+
   function downloadDiagnostics() {
     try {
       jQuery('#download-diagnostics-spinner').show();

From 39fb07b20e6197cf84502f55f35dde10bfeb2b54 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Fri, 24 Jul 2026 10:36:51 +0200
Subject: [PATCH 07/12] add template

---
 src/css/admin.css                     | 13 +++++++++++++
 src/views/compress-details-backup.php | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/css/admin.css b/src/css/admin.css
index 33bbcce5..ad3aaf34 100644
--- a/src/css/admin.css
+++ b/src/css/admin.css
@@ -481,4 +481,17 @@ fieldset.tinypng_convert_fields[disabled] {
 
 .tiny-mt-2 {
 	margin-top: 10px;
+}
+
+.tiny-dialog {
+	padding: 20px;
+	border: 1px solid #ccd0d4;
+	border-radius: 4px;
+	box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
+}
+
+.tiny-dialog-actions {
+	display: flex;
+	gap: 10px;
+	justify-content: flex-end;
 }
\ No newline at end of file
diff --git a/src/views/compress-details-backup.php b/src/views/compress-details-backup.php
index fe6812a6..fd05148e 100644
--- a/src/views/compress-details-backup.php
+++ b/src/views/compress-details-backup.php
@@ -27,15 +27,28 @@
 ?>
 <?php if ($backup_enabled) {
 	$backup = $tiny_image->get_backup();
+	$modal_id = "modal_" . absint( $tiny_image->get_id() ) . "_backup";
 ?>
 	<p>
 		<?php if ($backup) { ?>
 			<a href="<?php echo esc_attr( $backup ); ?>" target="_blank">
 				<?php esc_html_e('View Uncompressed'); ?>
 			</a>
-			<a href="">
+			<a href="#" data-dialog-id="<?php echo esc_attr($modal_id); ?>" data-id="<?php echo absint( $tiny_image->get_id() ); ?>">
 				<?php esc_html_e('Restore Backup', 'tiny-compress-images'); ?>
 			</a>
+			<dialog id="<?php echo esc_attr($modal_id); ?>" class="tiny-dialog">
+				<p><?php esc_html_e( 'Are you sure you want to restore the original uncompressed image?', 'tiny-compress-images' ); ?></p>
+				
+				<form method="dialog" class="tiny-dialog-actions">
+					<button value="cancel" class="button">
+						<?php esc_html_e( 'Cancel', 'tiny-compress-images' ); ?>
+					</button>
+					<button value="confirm" class="button button-primary">
+						<?php esc_html_e( 'Yes, Restore', 'tiny-compress-images' ); ?>
+					</button>
+				</form>
+			</dialog>
 		<?php } else { ?>
 			<span>
 				<?php esc_html_e('No backup available', 'tiny-compress-images'); ?>

From 2521b111c9b60b7be2a8be66b27c90b7206f3b32 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Fri, 24 Jul 2026 10:39:01 +0200
Subject: [PATCH 08/12] style: apply WordPress PHP coding standards

---
 src/class-tiny-image.php              |  8 ++++----
 src/views/compress-details-backup.php | 23 ++++++++++++-----------
 src/views/compress-details.php        | 11 ++++++-----
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/class-tiny-image.php b/src/class-tiny-image.php
index 253fa760..bc4f70ce 100644
--- a/src/class-tiny-image.php
+++ b/src/class-tiny-image.php
@@ -678,12 +678,12 @@ public function mark_as_compressed() {
 
 	/**
 	 * Retrieves the original image of the Tiny_Image
-	 * 
+	 *
 	 *
 	 * @return Tiny_Image_Size|false the image or false if does not exist
 	 */
 	private function get_original_image() {
-		$original_image = $this->get_image_size( Tiny_Image::ORIGINAL_UNSCALED );
+		$original_image = $this->get_image_size( self::ORIGINAL_UNSCALED );
 		if ( null === $original_image ) {
 			$original_image = $this->get_image_size();
 		}
@@ -746,7 +746,7 @@ public function create_backup() {
 		return $wp_filesystem->copy( $original_image->filename, $backup_file_path );
 	}
 
-	
+
 	/**
 	 * Retrieves the public URL of the backup of the original image.
 	 *
@@ -775,7 +775,7 @@ public function get_backup() {
 	 * Restores the original image from its backup.
 	 *
 	 * - Copies the backup file over the current original
-	 * - clears compression metadata 
+	 * - clears compression metadata
 	 * - updates the WordPress attachment metadata
 	 *
 	 * @since 3.7.0
diff --git a/src/views/compress-details-backup.php b/src/views/compress-details-backup.php
index fd05148e..ae55faaf 100644
--- a/src/views/compress-details-backup.php
+++ b/src/views/compress-details-backup.php
@@ -10,7 +10,7 @@
 $available_sizes              = array_keys( $this->settings->get_sizes() );
 $conversion_enabled           = $this->settings->get_conversion_enabled();
 $active_sizes                 = $this->settings->get_sizes();
-$backup_enabled				  = $this->settings->get_backup_enabled();
+$backup_enabled               = $this->settings->get_backup_enabled();
 $active_tinify_sizes          = $this->settings->get_active_tinify_sizes();
 $error                        = $tiny_image->get_latest_error();
 $total                        = $tiny_image->get_count( array( 'modified', 'missing', 'has_been_compressed', 'compressed', 'has_been_converted' ) );
@@ -25,19 +25,20 @@
 ksort( $size_exists );
 
 ?>
-<?php if ($backup_enabled) {
-	$backup = $tiny_image->get_backup();
-	$modal_id = "modal_" . absint( $tiny_image->get_id() ) . "_backup";
-?>
+<?php
+if ( $backup_enabled ) {
+	$backup   = $tiny_image->get_backup();
+	$modal_id = 'modal_' . absint( $tiny_image->get_id() ) . '_backup';
+	?>
 	<p>
-		<?php if ($backup) { ?>
+		<?php if ( $backup ) { ?>
 			<a href="<?php echo esc_attr( $backup ); ?>" target="_blank">
-				<?php esc_html_e('View Uncompressed'); ?>
+				<?php esc_html_e( 'View Uncompressed' ); ?>
 			</a>
-			<a href="#" data-dialog-id="<?php echo esc_attr($modal_id); ?>" data-id="<?php echo absint( $tiny_image->get_id() ); ?>">
-				<?php esc_html_e('Restore Backup', 'tiny-compress-images'); ?>
+			<a href="#" data-dialog-id="<?php echo esc_attr( $modal_id ); ?>" data-id="<?php echo absint( $tiny_image->get_id() ); ?>">
+				<?php esc_html_e( 'Restore Backup', 'tiny-compress-images' ); ?>
 			</a>
-			<dialog id="<?php echo esc_attr($modal_id); ?>" class="tiny-dialog">
+			<dialog id="<?php echo esc_attr( $modal_id ); ?>" class="tiny-dialog">
 				<p><?php esc_html_e( 'Are you sure you want to restore the original uncompressed image?', 'tiny-compress-images' ); ?></p>
 				
 				<form method="dialog" class="tiny-dialog-actions">
@@ -51,7 +52,7 @@
 			</dialog>
 		<?php } else { ?>
 			<span>
-				<?php esc_html_e('No backup available', 'tiny-compress-images'); ?>
+				<?php esc_html_e( 'No backup available', 'tiny-compress-images' ); ?>
 			</span>
 		<?php } ?>
 	</p>
diff --git a/src/views/compress-details.php b/src/views/compress-details.php
index 1f455296..c27c3b3f 100644
--- a/src/views/compress-details.php
+++ b/src/views/compress-details.php
@@ -10,7 +10,7 @@
 $available_sizes              = array_keys( $this->settings->get_sizes() );
 $conversion_enabled           = $this->settings->get_conversion_enabled();
 $active_sizes                 = $this->settings->get_sizes();
-$backup_enabled				  = $this->settings->get_backup_enabled();
+$backup_enabled               = $this->settings->get_backup_enabled();
 $active_tinify_sizes          = $this->settings->get_active_tinify_sizes();
 $error                        = $tiny_image->get_latest_error();
 $total                        = $tiny_image->get_count( array( 'modified', 'missing', 'has_been_compressed', 'compressed', 'has_been_converted' ) );
@@ -112,11 +112,12 @@
 				<?php echo esc_html__( 'Latest error', 'tiny-compress-images' ) . ': ' . esc_html( $error ); ?>
 			</span>
 			<br>
-		<?php } 
+			<?php
+		}
 		/* translators: %s is the image filename */
-		$modal_title = sprintf(esc_html__( 'Compression details for %s', 'tiny-compress-images' ), esc_html( $tiny_image->get_name() ));
+		$modal_title = sprintf( esc_html__( 'Compression details for %s', 'tiny-compress-images' ), esc_html( $tiny_image->get_name() ) );
 		?>
-		<a class="thickbox message" name="<?php echo esc_attr($modal_title); ?>" href="#TB_inline?width=700&amp;height=500&amp;inlineId=modal_<?php echo absint( $tiny_image->get_id() ); ?>">
+		<a class="thickbox message" name="<?php echo esc_attr( $modal_title ); ?>" href="#TB_inline?width=700&amp;height=500&amp;inlineId=modal_<?php echo absint( $tiny_image->get_id() ); ?>">
 			<?php esc_html_e( 'Details', 'tiny-compress-images' ); ?>
 		</a>
 	</div>
@@ -256,6 +257,6 @@
 				?>
 			</strong>
 		</p>
-		<?php include __DIR__ . '/compress-details-backup.php'; ?>
+		<?php require __DIR__ . '/compress-details-backup.php'; ?>
 	</div>
 </div>

From 834e0243d0603946c26e331f70620633df34bd6a Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Fri, 24 Jul 2026 11:18:35 +0200
Subject: [PATCH 09/12] delete backup when deleting attachment

---
 src/class-tiny-image.php  | 48 ++++++++++++++++++++++++++++-----------
 src/class-tiny-plugin.php |  1 +
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/class-tiny-image.php b/src/class-tiny-image.php
index bc4f70ce..07e2435e 100644
--- a/src/class-tiny-image.php
+++ b/src/class-tiny-image.php
@@ -774,9 +774,10 @@ public function get_backup() {
 	/**
 	 * Restores the original image from its backup.
 	 *
-	 * - Copies the backup file over the current original
-	 * - clears compression metadata
-	 * - updates the WordPress attachment metadata
+	 * - Copies the backup file over the current original.
+	 * - Clears compression metadata for all image sizes.
+	 * - Regenerates all thumbnail sizes from the restored image.
+	 * - Updates the WordPress attachment metadata.
 	 *
 	 * @since 3.7.0
 	 *
@@ -807,20 +808,41 @@ public function restore_backup() {
 			return false;
 		}
 
-		$original_image->meta = array();
+		// Clear compression metadata for all image sizes.
+		foreach ( $this->sizes as $size ) {
+			$size->meta = array();
+		}
 		$this->update_tiny_post_meta();
 
-		// only on non-unscaled, as resize can be turned on
-		if ( self::is_original( $original_size_key ) ) {
-			$image_size = wp_getimagesize( $original_image->filename );
-			if ( $image_size ) {
-				$this->wp_metadata['width']    = $image_size[0];
-				$this->wp_metadata['height']   = $image_size[1];
-				$this->wp_metadata['filesize'] = filesize( $original_image->filename );
-				wp_update_attachment_metadata( $this->id, $this->wp_metadata );
-			}
+		// Regenerate all thumbnail sizes from the restored image.
+		$new_metadata = wp_generate_attachment_metadata( $this->id, $original_image->filename );
+		if ( $new_metadata ) {
+			$this->wp_metadata = $new_metadata;
+			wp_update_attachment_metadata( $this->id, $this->wp_metadata );
 		}
 
 		return true;
 	}
+
+	/**
+	 * Deletes the backup file of the original image, if it exists.
+	 *
+	 * @since 3.7.0
+	 *
+	 * @return bool True on success or if no backup exists, false on deletion failure.
+	 */
+	public function delete_backup() {
+		$backup_file_path = $this->get_backup_path();
+		if ( false === $backup_file_path ) {
+			return true;
+		}
+
+		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+
+		if ( ! $wp_filesystem->exists( $backup_file_path ) ) {
+			return true;
+		}
+
+		return $wp_filesystem->delete( $backup_file_path );
+	}
 }
diff --git a/src/class-tiny-plugin.php b/src/class-tiny-plugin.php
index 09676fc7..d8f78630 100644
--- a/src/class-tiny-plugin.php
+++ b/src/class-tiny-plugin.php
@@ -914,6 +914,7 @@ public function friendly_user_name() {
 	public function clean_attachment( $post_id ) {
 		$tiny_image = new Tiny_Image( $this->settings, $post_id );
 		$tiny_image->delete_converted_image();
+		$tiny_image->delete_backup();
 	}
 
 	/**

From 8b380e3b4723cba81cd720c789fede25aa847a87 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Fri, 24 Jul 2026 11:19:10 +0200
Subject: [PATCH 10/12] remove unused variables

---
 src/views/compress-details-backup.php | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/views/compress-details-backup.php b/src/views/compress-details-backup.php
index ae55faaf..573b0af0 100644
--- a/src/views/compress-details-backup.php
+++ b/src/views/compress-details-backup.php
@@ -2,27 +2,11 @@
 /**
  * Details on the backup of the image
  *
- * @var Tiny_Plugin $this               The plugin instance.
- * @var Tiny_Image  $tiny_image         The image being compressed.
- * @var int[]       $images_to_compress The IDs that are being compressed
+ * @var Tiny_Plugin $this       The plugin instance.
+ * @var Tiny_Image  $tiny_image The image being compressed.
  */
 
-$available_sizes              = array_keys( $this->settings->get_sizes() );
-$conversion_enabled           = $this->settings->get_conversion_enabled();
-$active_sizes                 = $this->settings->get_sizes();
-$backup_enabled               = $this->settings->get_backup_enabled();
-$active_tinify_sizes          = $this->settings->get_active_tinify_sizes();
-$error                        = $tiny_image->get_latest_error();
-$total                        = $tiny_image->get_count( array( 'modified', 'missing', 'has_been_compressed', 'compressed', 'has_been_converted' ) );
-$active                       = $tiny_image->get_count( array( 'uncompressed', 'never_compressed', 'unconverted' ), $active_tinify_sizes );
-$image_statistics             = $tiny_image->get_statistics( $active_sizes, $active_tinify_sizes );
-$available_uncompressed_sizes = $image_statistics['available_uncompressed_sizes'];
-$size_before                  = $image_statistics['initial_total_size'];
-$size_after                   = $image_statistics['compressed_total_size'];
-
-$size_active = array_fill_keys( $active_tinify_sizes, true );
-$size_exists = array_fill_keys( $available_sizes, true );
-ksort( $size_exists );
+$backup_enabled = $this->settings->get_backup_enabled();
 
 ?>
 <?php

From c8b54f559912d9d6112bf37e7ad6aed067f38803 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Fri, 24 Jul 2026 11:20:00 +0200
Subject: [PATCH 11/12] handle error cases

---
 src/class-tiny-plugin.php | 6 +++++-
 src/js/admin.js           | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/class-tiny-plugin.php b/src/class-tiny-plugin.php
index d8f78630..6555d606 100644
--- a/src/class-tiny-plugin.php
+++ b/src/class-tiny-plugin.php
@@ -984,7 +984,11 @@ public function restore_backup_image() {
 
 		list($id, $metadata) = $response['data'];
 		$tiny_image          = new Tiny_Image( $this->settings, $id, $metadata );
-		$tiny_image->restore_backup();
+
+		if ( ! $tiny_image->restore_backup() ) {
+			echo esc_html__( 'Could not restore backup. The backup file may not exist or could not be written.', 'tiny-compress-images' );
+			exit();
+		}
 
 		$this->render_compress_details( $tiny_image );
 
diff --git a/src/js/admin.js b/src/js/admin.js
index deba76f5..f136f87a 100644
--- a/src/js/admin.js
+++ b/src/js/admin.js
@@ -1,5 +1,6 @@
 (function () {
   function restoreBackup(attachmentId, container) {
+    container.css('opacity', '0.5');
     jQuery.ajax({
       url: ajaxurl,
       type: 'POST',
@@ -9,8 +10,14 @@
         id: attachmentId,
       },
       success: function (data) {
+        container.css('opacity', '1');
         container.html(data);
       },
+      error: function () {
+        container.css('opacity', '1');
+        // TODO: Replace when actual message
+        container.html('<p>Could not restore backup. Please try again.</p>');
+      },
     });
   }
 

From a3fb73a4439ac0d7a2e62af4701aad7c860ce417 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Fri, 24 Jul 2026 11:31:35 +0200
Subject: [PATCH 12/12] test(backup): add restore and clean attachment tests

---
 test/helpers/wordpress.php          |  13 ++--
 test/unit/TinyPluginBackupTest.php  | 112 ++++++++++++++++++++++++++++
 test/wp-includes-for-tests/file.php |   9 ++-
 3 files changed, 126 insertions(+), 8 deletions(-)

diff --git a/test/helpers/wordpress.php b/test/helpers/wordpress.php
index 41972e61..3aaa007c 100644
--- a/test/helpers/wordpress.php
+++ b/test/helpers/wordpress.php
@@ -92,6 +92,8 @@ public function __construct($vfs)
 		$this->addMethod('is_multisite');
 		$this->addMethod('current_user_can');
 		$this->addMethod('wp_get_attachment_metadata');
+		$this->addMethod('wp_generate_attachment_metadata');
+		$this->addMethod('wp_update_attachment_metadata');
 		$this->addMethod('is_admin');
 		$this->addMethod('is_customize_preview');
 		$this->addMethod('is_plugin_active');
@@ -305,14 +307,11 @@ public function stub($method, $func)
 
 	public function createImage($file_size, $path, $name)
 	{
-		if (! $this->vfs->hasChild(self::UPLOAD_DIR . "/$path")) {
-			vfsStream::newDirectory(self::UPLOAD_DIR . "/$path")->at($this->vfs);
+		$full_dir = $this->vfs->url() . '/' . self::UPLOAD_DIR . '/' . $path;
+		if (! is_dir($full_dir)) {
+			mkdir($full_dir, 0777, true);
 		}
-		$dir = $this->vfs->getChild(self::UPLOAD_DIR . "/$path");
-
-		vfsStream::newFile($name)
-			->withContent(new LargeFileContent($file_size))
-			->at($dir);
+		file_put_contents($full_dir . '/' . $name, str_repeat("\x00", $file_size));
 	}
 
 	/**
diff --git a/test/unit/TinyPluginBackupTest.php b/test/unit/TinyPluginBackupTest.php
index 5e3a28b4..8b98e2d8 100644
--- a/test/unit/TinyPluginBackupTest.php
+++ b/test/unit/TinyPluginBackupTest.php
@@ -4,6 +4,7 @@
 
 use function PHPUnit\Framework\assertFalse;
 use function PHPUnit\Framework\assertTrue;
+use function PHPUnit\Framework\assertEquals;
 
 class Tiny_Plugin_Backup_Test extends Tiny_TestCase
 {
@@ -146,4 +147,115 @@ public function test_will_backup_unscaled_original_when_exists()
 		assertTrue($backup_made, 'expected backup of unscaled original to be made');
 		assertTrue(file_exists($expected_backup), 'expected backup of unscaled original to be created');
 	}
+
+	public function test_restore_backup_returns_false_when_no_backup_exists()
+	{
+		$this->wp->createImage( 37857, '2026/04', 'testfile.png' );
+
+		$wp_metadata   = array(
+			'file'  => '2026/04/testfile.png',
+			'sizes' => array(),
+		);
+		$mock_settings = $this->createMock( Tiny_Settings::class );
+		$tiny_image    = new Tiny_Image( $mock_settings, 1, $wp_metadata, null, array(), array() );
+
+		$result = $tiny_image->restore_backup();
+
+		assertFalse( $result, 'expected restore to return false when no backup exists' );
+	}
+
+	public function test_restore_backup_restores_file_from_backup()
+	{
+		// Create only the directory (via a placeholder) so the restore can write testfile.png
+		// without having to overwrite a LargeFileContent vfsStream file, which is read-only.
+		$this->wp->createImage( 1, '2026/04', '_placeholder.png' );
+		$this->wp->createImage( 100000, 'tinify_backup/2026/04', 'testfile.png' );
+
+		$this->wp->stub( 'wp_generate_attachment_metadata', function ( $id, $file ) {
+			return array(
+				'file'  => '2026/04/testfile.png',
+				'sizes' => array(),
+			);
+		} );
+
+		$wp_metadata   = array(
+			'file'  => '2026/04/testfile.png',
+			'sizes' => array(),
+		);
+		$mock_settings = $this->createMock( Tiny_Settings::class );
+		$tiny_image    = new Tiny_Image( $mock_settings, 1, $wp_metadata, null, array(), array() );
+
+		$result = $tiny_image->restore_backup();
+
+		$original_path = $this->vfs->url() . '/wp-content/uploads/2026/04/testfile.png';
+		assertTrue( $result, 'expected restore to return true' );
+		assertEquals( 100000, filesize( $original_path ), 'expected original file to be overwritten with backup content' );
+	}
+
+	public function test_restore_backup_clears_all_sizes_metadata()
+	{
+		// Create only thumbnail file (not testfile.png) so the restore writes testfile.png fresh.
+		$this->wp->createImage( 5000, '2026/04', 'testfile-150x150.png' );
+		$this->wp->createImage( 100000, 'tinify_backup/2026/04', 'testfile.png' );
+
+		$this->wp->stub( 'wp_generate_attachment_metadata', function ( $id, $file ) {
+			return array(
+				'file'  => '2026/04/testfile.png',
+				'sizes' => array(),
+			);
+		} );
+
+		$wp_metadata = array(
+			'file'  => '2026/04/testfile.png',
+			'sizes' => array(
+				'thumbnail' => array( 'file' => 'testfile-150x150.png', 'width' => 150, 'height' => 150 ),
+			),
+		);
+		$tiny_metadata = array(
+			Tiny_Image::ORIGINAL => array( 'input' => array( 'size' => 37857 ), 'output' => array( 'size' => 30000 ) ),
+			'thumbnail'          => array( 'input' => array( 'size' => 5000 ), 'output' => array( 'size' => 4000 ) ),
+		);
+		$mock_settings = $this->createMock( Tiny_Settings::class );
+		$mock_settings->method( 'get_sizes' )->willReturn( array() );
+		$mock_settings->method( 'get_active_tinify_sizes' )->willReturn( array() );
+		$tiny_image    = new Tiny_Image( $mock_settings, 1, $wp_metadata, $tiny_metadata );
+
+		$tiny_image->restore_backup();
+
+		assertEquals( array(), $tiny_image->get_image_size( Tiny_Image::ORIGINAL )->meta, 'expected original size metadata to be cleared' );
+		assertEquals( array(), $tiny_image->get_image_size( 'thumbnail' )->meta, 'expected thumbnail size metadata to be cleared' );
+	}
+
+	public function test_clean_attachment_deletes_backup_file()
+	{
+		$this->wp->createImage( 37857, '2026/04', 'testfile.png' );
+		$this->wp->createImage( 100000, 'tinify_backup/2026/04', 'testfile.png' );
+		$backup_path = $this->vfs->url() . '/wp-content/uploads/tinify_backup/2026/04/testfile.png';
+
+		$this->wp->stub( 'wp_get_attachment_metadata', function ( $i ) {
+			return array(
+				'file'  => '2026/04/testfile.png',
+				'sizes' => array(),
+			);
+		} );
+
+		$tiny_plugin   = new Tiny_Plugin();
+		$ref           = new \ReflectionClass( $tiny_plugin );
+		$settings_prop = $ref->getProperty( 'settings' );
+		$settings_prop->setAccessible( true );
+		$mock_settings = $this->createMock( Tiny_Settings::class );
+		$settings_prop->setValue( $tiny_plugin, $mock_settings );
+
+		assertTrue( file_exists( $backup_path ), 'expected backup to exist before clean_attachment' );
+		$tiny_plugin->clean_attachment( 1 );
+		assertFalse( file_exists( $backup_path ), 'expected backup to be deleted after clean_attachment' );
+	}
+
+	public function test_ajax_init_adds_restore_backup_action()
+	{
+		$tiny_plugin = new Tiny_Plugin();
+		$tiny_plugin->ajax_init();
+
+		WordPressStubs::assertHook( 'wp_ajax_tiny_restore_backup', array( $tiny_plugin, 'restore_backup_image' ) );
+	}
 }
diff --git a/test/wp-includes-for-tests/file.php b/test/wp-includes-for-tests/file.php
index c5ea20a6..ab529fee 100644
--- a/test/wp-includes-for-tests/file.php
+++ b/test/wp-includes-for-tests/file.php
@@ -15,7 +15,14 @@ public function copy( $src, $dest, $overwrite = false, $mode = false ) {
 		if ( ! $overwrite && file_exists( $dest ) ) {
 			return false;
 		}
-		return copy( $src, $dest );
+		// Use file_get_contents + file_put_contents instead of copy() so that
+		// vfsStream files backed by LargeFileContent (read-only virtual content)
+		// can be overwritten in tests.
+		$content = file_get_contents( $src );
+		if ( false === $content ) {
+			return false;
+		}
+		return file_put_contents( $dest, $content ) !== false;
 	}
 
 	public function get_contents( $path ) {