diff --git a/files/templates/CHRISTMAS/comments/CommentActions.html b/files/templates/CHRISTMAS/comments/CommentActions.html
index 9780dac0c6..781c442468 100644
--- a/files/templates/CHRISTMAS/comments/CommentActions.html
+++ b/files/templates/CHRISTMAS/comments/CommentActions.html
@@ -45,6 +45,16 @@
 			<i class="fas fa-gift fa-fw mr-2" aria-hidden="true"></i>Gift Award
 		</button>
 	</li>
+	<li id="unsave-{{c.id}}" class="hidden {% if c.id in v.saved_comment_idlist() %}md:block{% endif %}">
+		<button class="hover:text-gray-400" onclick="post_toast3('/unsave_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')">
+			<i class="fas fa-bookmark fa-fw mr-2"></i>Unsave
+		</button>
+	</li>
+	<li id="save-{{c.id}}" class="hidden {% if c.id not in v.saved_comment_idlist() %}md:block{% endif %}">
+		<button class="hover:text-gray-400" onclick="post_toast3('/save_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')">
+			<i class="far fa-bookmark fa-fw mr-2"></i>Save
+		</button>
+	</li>
 	{% endif %}
 
 	<li class="hidden md:block">
@@ -79,22 +89,7 @@
 						<i class="fas fa-book-open fa-sm fa-fw mr-4"></i>Context
 					</a>
 				</li>
-				{% if v %}
-				<li id="unsave-{{c.id}}" class="hidden {% if c.id in v.saved_comment_idlist() %}md:block{% endif %}">
-					<button class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" onclick="post_toast3('/unsave_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')">
-						<i class="fas fa-bookmark fa-sm fa-fw mr-4"></i>Unsave
-					</button>
-				</li>
-				<li id="save-{{c.id}}" class="hidden {% if c.id not in v.saved_comment_idlist() %}md:block{% endif %}">
-					<button class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" onclick="post_toast3('/save_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')">
-						<i class="far fa-bookmark fa-sm fa-fw mr-4"></i>Save
-					</button>
-				</li>
-				{% endif %}
 				{% if v and c.parent_submission and c.author_id==v.id %}
-				<li>
-					<hr class="mt-2 mb-1.5 border-t border-black h-1 shadow-inset-t-white-05"/>
-				</li>
 				<li class="hidden md:block">
 					<button class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" onclick="toggleEdit('{{c.id}}')">
 						<i class="fas fa-edit fa-sm fa-fw mr-4"></i>Edit
diff --git a/files/templates/CHRISTMAS/submission/SubmissionActions.html b/files/templates/CHRISTMAS/submission/SubmissionActions.html
index a10e412cd2..1a1a5ae4b6 100644
--- a/files/templates/CHRISTMAS/submission/SubmissionActions.html
+++ b/files/templates/CHRISTMAS/submission/SubmissionActions.html
@@ -59,6 +59,16 @@
 			<i class="fas fa-bell-slash fa-fw mr-2"></i>Unsubscribe
 		</button>
 	</li>
+	<li id="save-{{p.id}}" class="{% if p.id in v.saved_idlist() %}hidden{% endif %}">
+		<button class="hover:text-gray-400" onclick="post_toast2('/save_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}')">
+			<i class="far fa-bookmark fa-fw mr-2"></i>Save
+		</button>
+	</li>
+	<li id="unsave-{{p.id}}" class="{% if not p.id in v.saved_idlist() %}hidden{% endif %}">
+		<button class="hover:text-gray-400" onclick="post_toast2('/unsave_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}')">
+			<i class="fas fa-bookmark fa-fw mr-2"></i>Unsave
+		</button>
+	</li>
 	{% endif %}
 	<!-- Does not require auth -->
 	<li class="hidden md:inline-block">
@@ -83,24 +93,8 @@
 						<i class="fas fa-link fa-sm fa-fw mr-4"></i>Copy link
 					</button>
 				</li>
-				<!-- Requies auth -->
-				{% if v %}
-				<li id="save-{{p.id}}" class="{% if p.id in v.saved_idlist() %}hidden{% endif %}">
-					<button class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" onclick="post_toast2('/save_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}')">
-						<i class="far fa-bookmark fa-sm fa-fw mr-4"></i>Save
-					</button>
-				</li>
-				<li id="unsave-{{p.id}}" class="{% if not p.id in v.saved_idlist() %}hidden{% endif %}">
-					<button class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" onclick="post_toast2('/unsave_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}')">
-						<i class="fas fa-bookmark fa-sm fa-fw mr-4"></i>Unsave
-					</button>
-				</li>
-				{% endif %}
 				<!-- Requires author -->
 				{% if v and v.id==p.author_id %}
-				<li>
-					<hr class="mt-2 mb-1.5 border-t border-black h-1 shadow-inset-t-white-05"/>
-				</li>
 				<li id="pin-profile-{{p.id}}" class="{% if p.is_stickied %}hidden{% endif %}">
 					<button class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" onclick="post_toast2('/pin/{{p.id}}','unpin-profile-{{p.id}}','pin-profile-{{p.id}}')">
 						<i class="fas fa-thumbtack fa-rotate--45 fa-sm fa-fw mr-4"></i>Pin to profile