diff --git a/files/templates/CHRISTMAS/submission/SubmissionActions.html b/files/templates/CHRISTMAS/submission/SubmissionActions.html
index 763fee964..91b0d715a 100644
--- a/files/templates/CHRISTMAS/submission/SubmissionActions.html
+++ b/files/templates/CHRISTMAS/submission/SubmissionActions.html
@@ -1,11 +1,19 @@
 <ul class="inline-flex flex-wrap items-center space-x-3 gap-2 text-sm text-gray-500 mb-0">
 
 	{% if p.realbody(v) and '/post/' not in request.full_path and not p.over_18 %}
-	<li>
-		<button class="hover:text-gray-400" onclick="expandText('{{p.id}}')">
-			<i class="fas fa-expand-alt fa-fw text-expand-icon-{{p.id}}"></i>
-		</button>
-	</li>
+		{% if v and v.compact %}
+		<li>
+			<button class="hover:text-gray-400" onclick="expandTextCompact('{{p.id}}')">
+				<i class="fas fa-expand-alt fa-fw text-expand-icon-{{p.id}}"></i>
+			</button>
+		</li>
+		{% else %}
+		<li>
+			<button class="hover:text-gray-400" onclick="expandText('{{p.id}}')">
+				<i class="fas fa-expand-alt fa-fw text-expand-icon-{{p.id}}"></i>
+			</button>
+		</li>
+		{% endif %}
 	{% endif %}
 
 	{% if '/post/' not in request.full_path %}
diff --git a/files/templates/CHRISTMAS/submission/SubmissionActionsMobile.html b/files/templates/CHRISTMAS/submission/SubmissionActionsMobile.html
index 5ce43edbf..845347519 100644
--- a/files/templates/CHRISTMAS/submission/SubmissionActionsMobile.html
+++ b/files/templates/CHRISTMAS/submission/SubmissionActionsMobile.html
@@ -1,10 +1,18 @@
 <ul class="flex items-center text-sm text-gray-500 mb-0">
 	{% if p.realbody(v) and '/post/' not in request.full_path and not p.over_18 %}
-	<li class="mr-5">
-		<button class="hover:text-gray-400" onclick="expandText('{{p.id}}')">
-			<i class="fas fa-expand-alt fa-fw text-expand-icon-{{p.id}}"></i>
-		</button>
-	</li>
+		{% if v and v.compact %}
+		<li class="mr-5">
+			<button class="hover:text-gray-400" onclick="expandTextCompact('{{p.id}}')">
+				<i class="fas fa-expand-alt fa-fw text-expand-icon-{{p.id}}"></i>
+			</button>
+		</li>
+		{% else %}
+		<li class="mr-5">
+			<button class="hover:text-gray-400" onclick="expandText('{{p.id}}')">
+				<i class="fas fa-expand-alt fa-fw text-expand-icon-{{p.id}}"></i>
+			</button>
+		</li>
+		{% endif %}
 	{% endif %}
 	<li class="mr-5">
 		<a {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %} class="text-gray-500 hover:text-gray-400">
diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 6ae18422e..0e2d17e43 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -388,7 +388,7 @@
 {% include "CHRISTMAS/expanded_image_modal.html" %}
 
 <script defer src="/assets/CHRISTMAS/js/new_comments_count.js?a=1"></script>
-<script defer src="/assets/CHRISTMAS/js/submission_listing.js?a=6"></script>
+<script defer src="/assets/CHRISTMAS/js/submission_listing.js?a=7"></script>
 
 <style>
 	.mod:before {
diff --git a/files/templates/CHRISTMAS/submission_listing_compact.html b/files/templates/CHRISTMAS/submission_listing_compact.html
index 3c89a62d1..1575f6b5c 100644
--- a/files/templates/CHRISTMAS/submission_listing_compact.html
+++ b/files/templates/CHRISTMAS/submission_listing_compact.html
@@ -244,12 +244,6 @@
 				</a>
 			</h5>
 
-			{% if p.realbody(v) and not p.over_18 %}
-				<div class="{% if p.author.agendaposter %}agendaposter{% endif %} post-text relative z-10 overflow-hidden pointer-events-none text-gray-500 break-words hidden" style="word-break: break-word;" id="post-text-{{p.id}}">
-					{{p.realbody(v) | safe}}
-				</div>
-			{% endif %}
-
 			<div class="relative z-10 group-hover:z-20 hidden md:inline-block">
 				{% include "CHRISTMAS/submission/SubmissionActions.html" %}
 			</div>
@@ -283,6 +277,12 @@
 
 </div>
 
+	{% if p.realbody(v) and not p.over_18 %}
+		<div class="{% if p.author.agendaposter %}agendaposter{% endif %} post-text relative z-10 break-words dark:text-gray-400 text-black dark:text-gray-100 p-4 border border-gray-400 mt-1 mb-1.5" style="word-break: break-word;" id="post-text-{{p.id}}">
+			{{p.realbody(v) | safe}}
+		</div>
+	{% endif %}
+
 {% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}
 <div class="md:ml-[4.5rem] mt-4">
 	<a target="_blank" rel="nofollow noopener noreferrer" href="{{p.url}}" class="inline-block">
@@ -385,7 +385,7 @@
 {% include "CHRISTMAS/expanded_image_modal.html" %}
 
 <script defer src="/assets/CHRISTMAS/js/new_comments_count.js?a=1"></script>
-<script defer src="/assets/CHRISTMAS/js/submission_listing.js?a=6"></script>
+<script defer src="/assets/CHRISTMAS/js/submission_listing.js?a=7"></script>
 
 <style>
 	.mod:before {