diff --git a/ext/admin/main.php b/ext/admin/main.php
index 179a13c7..b5542c26 100644
--- a/ext/admin/main.php
+++ b/ext/admin/main.php
@@ -213,5 +213,46 @@ class AdminPage extends Extension {
 		//TODO: Delete file after downloaded?
 		return false;  // we do want a redirect, but a manual one
 	}
+
+    private function reset_image_ids() {
+        global $database;
+
+        //This might be a bit laggy on boards with lots of images (?)
+        //Seems to work fine with 1.2k~ images though.
+        $i = 0;
+        $image = $database->get_all("SELECT * FROM images ORDER BY images.id ASC");
+        /*$score_log = $database->get_all("SELECT message FROM score_log");*/
+        foreach($image as $img){
+            $xid = $img[0];
+            $i = $i + 1;
+            $table = array( //Might be missing some tables?
+                "image_tags", "tag_histories", "image_reports", "comments", "user_favorites", "tag_histories",
+                "numeric_score_votes", "pool_images", "slext_progress_cache", "notes");
+    
+            $sql =
+                "SET FOREIGN_KEY_CHECKS=0;
+                UPDATE images
+                SET id=".$i.
+                " WHERE id=".$xid.";"; //id for images
+    
+            foreach($table as $tbl){
+                $sql .= "
+                    UPDATE ".$tbl."
+                    SET image_id=".$i."
+                    WHERE image_id=".$xid.";";
+            }
+    
+            /*foreach($score_log as $sl){
+                //This seems like a bad idea.
+                //TODO: Might be better for log_info to have an $id option (which would then affix the id to the table?)
+                preg_replace(".Image \\#[0-9]+.", "Image #".$i, $sl);
+            }*/
+            $sql .= " SET FOREIGN_KEY_CHECKS=1;";
+            $database->execute($sql);
+        }
+        $count = (count($image)) + 1;
+        $database->execute("ALTER TABLE images AUTO_INCREMENT=".$count);
+        return true;
+    }
 }
 ?>
diff --git a/ext/admin/theme.php b/ext/admin/theme.php
index 7069afc0..e16b1d73 100644
--- a/ext/admin/theme.php
+++ b/ext/admin/theme.php
@@ -16,8 +16,8 @@ class AdminPageTheme extends Themelet {
 		$c_protected = $protected ? " protected" : "";
 		$html = make_form(make_link("admin/$action"), "POST", false, false, false, "admin$c_protected");
 		if($protected) {
-			$html .= "<input type='checkbox' onclick='$(\"#$action\").attr(\"disabled\", !$(this).is(\":checked\"))'>";
 			$html .= "<input type='submit' id='$action' value='$name' disabled='true'>";
+			$html .= "<input type='checkbox' onclick='$(\"#$action\").attr(\"disabled\", !$(this).is(\":checked\"))'>";
 		}
 		else {
 			$html .= "<input type='submit' id='$action' value='$name'>";
@@ -40,7 +40,9 @@ class AdminPageTheme extends Themelet {
 		$html .= $this->button("All tags to lowercase", "lowercase_all_tags", true);
 		$html .= $this->button("Recount tag use", "recount_tag_user", false);
 		$html .= $this->button("Download all images", "image_dump", false);
-		$html .= $this->button("Download database contents", "database_dump", false);
+        $html .= $this->button("Download database contents", "database_dump", false);
+		if($database->get_driver_name() == "mysql")
+			$html .= $this->button("Reset image IDs", "reset_image_ids", true);
 		$page->add_block(new Block("Misc Admin Tools", $html));
 
 		$html = make_form(make_link("admin/set_tag_case"), "POST");