diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index f721b7763f..8cc55eeac6 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -6901,13 +6901,13 @@ div.markdown {
 	margin-bottom: 0 !important;
 }
 
-#desktop-expanded-image {
+#expanded-image {
 	max-width: 90%;
 	max-height: 100vh;
 	border: 5px white solid;
 }
 @media (max-width: 768px) {
-	#desktop-expanded-image {
+	#expanded-image {
 		max-width: 100%;
 		max-height: 65vh;
 	}
diff --git a/files/assets/css/themes/dramblr.css b/files/assets/css/themes/dramblr.css
index c9177ff1a3..3515636595 100644
--- a/files/assets/css/themes/dramblr.css
+++ b/files/assets/css/themes/dramblr.css
@@ -80,7 +80,7 @@ blockquote {
 	color: var(--gray-400) !important
 }
 
-#frontpage div#expandImageModal.modal.desktop-expanded-image-modal {
+#frontpage div#expandImageModal.modal.expanded-image-modal {
 	background-color: transparent !important;
 }
 
diff --git a/files/assets/js/core.js b/files/assets/js/core.js
index 4dd37b10b1..6bb1653021 100644
--- a/files/assets/js/core.js
+++ b/files/assets/js/core.js
@@ -191,16 +191,16 @@ function expandImage(url) {
 		return;
 	e.preventDefault();
 
-	document.getElementById("desktop-expanded-image").src = '';
-	document.getElementById("desktop-expanded-image-wrap-link").href = '';
+	document.getElementById("expanded-image").src = '';
+	document.getElementById("expanded-image-wrap-link").href = '';
 
 	if (!url)
 	{
 		url = e.target.dataset.src
 		if (!url) url = e.target.src
 	}
-	document.getElementById("desktop-expanded-image").src = url.replace("200w.webp", "giphy.webp");
-	document.getElementById("desktop-expanded-image-wrap-link").href = url.replace("200w.webp", "giphy.webp");
+	document.getElementById("expanded-image").src = url.replace("200w.webp", "giphy.webp");
+	document.getElementById("expanded-image-wrap-link").href = url.replace("200w.webp", "giphy.webp");
 
 	location.hash = 'm-expandImage'
 };
diff --git a/files/templates/errors/WPD/404.html b/files/templates/errors/WPD/404.html
index ab678b8ef1..a1c935e323 100644
--- a/files/templates/errors/WPD/404.html
+++ b/files/templates/errors/WPD/404.html
@@ -74,8 +74,8 @@
 	<div class="modal" id="m-expandImage" tabindex="-1">
 	<div class="modal-dialog modal-dialog-centered">
 	<div class="modal-body text-center p-0">
-	<a rel="nofollow noopener" target="_blank" id="desktop-expanded-image-wrap-link">
-	<img loading="lazy" alt="expanded image" class="rounded" id="desktop-expanded-image">
+	<a rel="nofollow noopener" target="_blank" id="expanded-image-wrap-link">
+	<img loading="lazy" alt="expanded image" class="rounded" id="expanded-image">
 	</a>
 	</div>
 	</div>
diff --git a/files/templates/errors/WPD/502.html b/files/templates/errors/WPD/502.html
index 0415bd2cc5..7e850a72d7 100644
--- a/files/templates/errors/WPD/502.html
+++ b/files/templates/errors/WPD/502.html
@@ -74,8 +74,8 @@
 	<div class="modal" id="m-expandImage" tabindex="-1">
 	<div class="modal-dialog modal-dialog-centered">
 	<div class="modal-body text-center p-0">
-	<a rel="nofollow noopener" target="_blank" id="desktop-expanded-image-wrap-link">
-	<img loading="lazy" alt="expanded image" class="rounded" id="desktop-expanded-image">
+	<a rel="nofollow noopener" target="_blank" id="expanded-image-wrap-link">
+	<img loading="lazy" alt="expanded image" class="rounded" id="expanded-image">
 	</a>
 	</div>
 	</div>
diff --git a/files/templates/errors/rDrama/404.html b/files/templates/errors/rDrama/404.html
index 322d56c353..bfa528b0cb 100644
--- a/files/templates/errors/rDrama/404.html
+++ b/files/templates/errors/rDrama/404.html
@@ -74,8 +74,8 @@
 	<div class="modal" id="m-expandImage" tabindex="-1">
 	<div class="modal-dialog modal-dialog-centered">
 	<div class="modal-body text-center p-0">
-	<a rel="nofollow noopener" target="_blank" id="desktop-expanded-image-wrap-link">
-	<img loading="lazy" alt="expanded image" class="rounded" id="desktop-expanded-image">
+	<a rel="nofollow noopener" target="_blank" id="expanded-image-wrap-link">
+	<img loading="lazy" alt="expanded image" class="rounded" id="expanded-image">
 	</a>
 	</div>
 	</div>
diff --git a/files/templates/errors/rDrama/502.html b/files/templates/errors/rDrama/502.html
index 7fd4544c28..2b4515c7d7 100644
--- a/files/templates/errors/rDrama/502.html
+++ b/files/templates/errors/rDrama/502.html
@@ -74,8 +74,8 @@
 	<div class="modal" id="m-expandImage" tabindex="-1">
 	<div class="modal-dialog modal-dialog-centered">
 	<div class="modal-body text-center p-0">
-	<a rel="nofollow noopener" target="_blank" id="desktop-expanded-image-wrap-link">
-	<img loading="lazy" alt="expanded image" class="rounded" id="desktop-expanded-image">
+	<a rel="nofollow noopener" target="_blank" id="expanded-image-wrap-link">
+	<img loading="lazy" alt="expanded image" class="rounded" id="expanded-image">
 	</a>
 	</div>
 	</div>
diff --git a/files/templates/modals/expanded_image.html b/files/templates/modals/expanded_image.html
index 528070c25e..ed12f090ef 100644
--- a/files/templates/modals/expanded_image.html
+++ b/files/templates/modals/expanded_image.html
@@ -3,8 +3,8 @@
 	<div class="modal-dialog modal-dialog-centered">
 		<div class="modal-content" style="background-color: transparent !important; border: none !important;">
 			<div class="modal-body text-center p-0">
-				<a rel="nofollow noopener" target="_blank" id="desktop-expanded-image-wrap-link">
-					<img loading="lazy" alt="expanded image" class="rounded" id="desktop-expanded-image">
+				<a rel="nofollow noopener" target="_blank" id="expanded-image-wrap-link">
+					<img loading="lazy" alt="expanded image" class="rounded" id="expanded-image">
 				</a>
 			</div>
 		</div>