diff --git a/ext/image/main.php b/ext/image/main.php
index 4c2544ef..86a2c71a 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -98,6 +98,7 @@ class ImageIO extends SimpleExtension {
 		$config->set_default_string('thumb_convert_path', 'convert.exe');
 
 		$config->set_default_bool('image_show_meta', false);
+		$config->set_default_bool('jquery_confirm', true);
 		$config->set_default_string('image_ilink', '');
 		$config->set_default_string('image_tlink', '');
 		$config->set_default_string('image_tip', '$tags // $size // $filesize');
@@ -170,6 +171,7 @@ class ImageIO extends SimpleExtension {
 		if(!in_array("OS", $_SERVER) || $_SERVER["OS"] != 'Windows_NT') {
 			$sb->add_bool_option("image_show_meta", "<br>Show metadata: ");
 		}
+		$sb->add_bool_option("jquery_confirm", "<br>Confirm Delete with jQuery: ");
 		$event->panel->add_block($sb);
 
 		$thumbers = array();
diff --git a/ext/image/theme.php b/ext/image/theme.php
index 2682314e..10bfcfe4 100644
--- a/ext/image/theme.php
+++ b/ext/image/theme.php
@@ -8,14 +8,25 @@ class ImageIOTheme {
 	 */
 	public function get_deleter_html($image_id) {
 		global $user;
+		global $config;
 
 		$i_image_id = int_escape($image_id);
-		$html = "
-			".make_form(make_link("image_admin/delete"),'POST',false,'delete_image')."
-				<input type='hidden' name='image_id' value='$i_image_id'>
-				<input type='submit' value='Delete' onclick='return confirm(\"Delete the image?\");'>
-			</form>
-		";
+		
+		if($config->get_bool("jquery_confirm")) {
+			$html = "
+				".make_form(make_link("image_admin/delete"),'POST',false,'delete_image')."
+					<input type='hidden' name='image_id' value='$i_image_id' />
+					<input type='submit' value='Delete' id='delete_image_submit' />
+				</form>
+			";
+		} else {
+			$html = "
+				".make_form(make_link("image_admin/delete"))."
+					<input type='hidden' name='image_id' value='$i_image_id' />
+					<input type='submit' value='Delete' onclick='return confirm(\"Delete the image?\");' />
+				</form>
+			";
+		}
 		return $html;
 	}
 }
diff --git a/lib/css/smoothness/jquery-ui-1.8.15.custom.css b/lib/jquery-ui-1.8.15.custom.css
similarity index 100%
rename from lib/css/smoothness/jquery-ui-1.8.15.custom.css
rename to lib/jquery-ui-1.8.15.custom.css
diff --git a/lib/shimmie.js b/lib/shimmie.js
index 14af3ce7..6e72770c 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -1,3 +1,33 @@
+
+// Adding jQuery ui stuff
+$(document).ready(function() {
+
+	var $confirm = $('<div id="dialog-confirm"></div>')
+		.html('<p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>This image will be permanently deleted and cannot be recovered. Are you sure?</p>')
+		.dialog({
+			resizable: false,
+			height:220,
+			modal: true,
+			autoOpen: false,
+			title: 'Delete Image?',
+			buttons: {
+				"Delete Image": function() {
+					 $( this ).dialog( "close" );
+					 $('form#delete_image').submit();
+				},
+				Cancel: function() {
+					$( this ).dialog( "close" );
+				}
+			}
+		});
+
+	$('form#delete_image #delete_image_submit').click(function(e){
+		e.preventDefault();
+		$confirm.dialog('open');
+	});
+	
+});
+
 var defaultTexts = new Array();
 
 window.onload = function(e) {