diff --git a/files/templates/comments.html b/files/templates/comments.html
index 5dd6da421a..73cd0c04af 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -295,10 +295,10 @@
 							{% endif %}
 						{% elif v %}
 
-							<li id="comment-{{c.id}}-up" tabindex="0" class="list-inline-item arrow-up upvote-button d-none d-md-inline-block mr-2 comment-{{c.id}}-up {% if voted==1 %}active{% endif %}" data-bs-id-up="{{c.id}}" data-bs-content-type="comment"></li>
+							<li id="comment-{{c.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'comment-{{c.id}}-up', 'comment-{{c.id}}-down', 'comment-score-{{c.id}}')" class="list-inline-item arrow-up upvote-button d-none d-md-inline-block mr-2 comment-{{c.id}}-up {% if voted==1 %}active{% endif %}"></li>
 
 						{% else %}
-							<li id="comment-{{c.id}}-up" tabindex="0" class="list-inline-item arrow-up d-none d-md-inline-block mr-2" onclick="location.href='/login';"></li>
+							<li id="comment-{{c.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'comment-{{c.id}}-up', 'comment-{{c.id}}-down', 'comment-score-{{c.id}}')" class="list-inline-item arrow-up d-none d-md-inline-block mr-2" onclick="location.href='/login';"></li>
 
 						{% endif %}
 
@@ -311,11 +311,11 @@
 							<li class="list-inline-item arrow-down d-none d-md-inline-block mr-2 comment-{{c.id}}-down active"></li>
 							{% endif %}
 						{% elif v %}
-							<li {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" class="list-inline-item arrow-down downvote-button d-none d-md-inline-block mr-2 comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}" data-bs-id-down="{{c.id}}" data-bs-content-type="comment"></li>
+							<li {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'comment-{{c.id}}-up', 'comment-{{c.id}}-down', 'comment-score-{{c.id}}')" class="list-inline-item arrow-down downvote-button d-none d-md-inline-block mr-2 comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}"></li>
 
 						{% else %}
 
-							<li {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" class="list-inline-item arrow-down d-none d-md-inline-block" onclick="location.href='/login';"></li>
+							<li {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'comment-{{c.id}}-up', 'comment-{{c.id}}-down', 'comment-score-{{c.id}}')" class="list-inline-item arrow-down d-none d-md-inline-block" onclick="location.href='/login';"></li>
 
 						{% endif %}
 
@@ -396,9 +396,9 @@
 						{% if v and request.path.startswith('/@') and v.admin_level == 0 %}
 							{% if voted==1 %}<li class="list-inline-item arrow-up d-inline-block d-md-none mr-2 comment-{{c.id}}-up active"></li>{% endif %}
 						{% elif v %}
-							<li id="comment-{{c.id}}-up" tabindex="0" class="list-inline-item arrow-up upvote-button d-inline-block d-md-none mr-2 comment-{{c.id}}-up {% if voted==1 %}active{% endif %}" data-bs-id-up="{{c.id}}" data-bs-content-type="comment"></li>
+							<li id="comment-{{c.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'comment-{{c.id}}-up', 'comment-{{c.id}}-down', 'comment-score-{{c.id}}')" class="list-inline-item arrow-up upvote-button d-inline-block d-md-none mr-2 comment-{{c.id}}-up {% if voted==1 %}active{% endif %}"></li>
 						{% else %}
-							<li id="comment-{{c.id}}-up" tabindex="0" class="list-inline-item arrow-up d-inline-block d-md-none mr-2" onclick="location.href='/login';"></li>
+							<li id="comment-{{c.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'comment-{{c.id}}-up', 'comment-{{c.id}}-down', 'comment-score-{{c.id}}')" class="list-inline-item arrow-up d-inline-block d-md-none mr-2" onclick="location.href='/login';"></li>
 						{% endif %}
 						<li class="list-inline-item d-inline-block d-md-none mr-2"><span class="points" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="+{{ups}} | -{{downs}}"><span id="comment-score-{{c.id}}" class="score comment-score-{{c.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}">{{score}}</span></span></li>
 						{% if v and request.path.startswith('/@') and v.admin_level == 0 %}
@@ -406,9 +406,9 @@
 								<li class="list-inline-item arrow-down d-inline-block d-md-none mr-2 comment-{{c.id}}-up active"></li>
 							{% endif %}
 						{% elif v %}
-							<li {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" class="list-inline-item arrow-down downvote-button d-inline-block d-md-none mr-2 comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}" data-bs-id-down="{{c.id}}" data-bs-content-type="comment"></li>
+							<li {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'comment-{{c.id}}-up', 'comment-{{c.id}}-down', 'comment-score-{{c.id}}')" class="list-inline-item arrow-down downvote-button d-inline-block d-md-none mr-2 comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}"></li>
 						{% else %}
-							<li {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" class="list-inline-item arrow-down d-inline-block d-md-none" onclick="location.href='/login';"></li>
+							<li {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'comment-{{c.id}}-up', 'comment-{{c.id}}-down', 'comment-score-{{c.id}}')" class="list-inline-item arrow-down d-inline-block d-md-none" onclick="location.href='/login';"></li>
 						{% endif %}
 					</ul>
 				</div>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 21b3bada90..7b31f5263d 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -496,19 +496,19 @@
 					{% if v %}
 
 					<div id="voting" class="voting d-none d-md-block mb-auto">
-						<div id="post-{{p.id}}-up" tabindex="0" data-bs-id-up="{{p.id}}" data-bs-content-type="post" class="mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
+						<div id="post-{{p.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'post-{{p.id}}-up', 'post-{{p.id}}-down', 'post-score-{{p.id}}')" class="mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
 
 						<span id="post-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-original-title="+{{ups}} | -{{downs}}">{{score}}</span>
-						<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" data-bs-id-down="{{p.id}}" data-bs-content-type="post" class="text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
+						<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'post-{{p.id}}-up', 'post-{{p.id}}-down', 'post-score-{{p.id}}')" class="text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
 					</div>
 
 					{% else %}
 
 					<div id="voting" class="voting d-none d-md-block mb-auto">
-						<div id="post-{{p.id}}-up" tabindex="0" class="arrow-up mx-auto" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
+						<div id="post-{{p.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'post-{{p.id}}-up', 'post-{{p.id}}-down', 'post-score-{{p.id}}')" class="arrow-up mx-auto" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
 						</div>
 						<span id="post-{{p.id}}-score-none" class="score text-muted"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" data-bs-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-						<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" class="arrow-down mx-auto" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></div>
+						<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'post-{{p.id}}-up', 'post-{{p.id}}-down', 'post-score-{{p.id}}')" class="arrow-down mx-auto" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></div>
 					</div>
 
 					{% endif %}
@@ -554,7 +554,7 @@
 				{% endif %}
 				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}">
 					{% if v %}
-					<span id="post-{{p.id}}-up-mobile" tabindex="0" data-bs-id-up="{{p.id}}" data-bs-content-type="post" class="mr-2 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
+					<span id="post-{{p.id}}-up-mobile" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'post-{{p.id}}-up-mobile', 'post-{{p.id}}-down-mobile', 'post-score-{{p.id}}-mobile')" class="mr-2 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
 					</span>
 					{% else %}
 					<span id="arrow-{{p.id}}-mobile-up" tabindex="0" class="mr-2 arrow-mobile-up" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
@@ -565,7 +565,7 @@
 					<span id="post-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="+{{ups}} | -{{downs}}">{{score}}</span>
 
 					{% if v %}
-						<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down-mobile" tabindex="0" data-bs-id-down="{{p.id}}" data-bs-content-type="post" class="ml-2 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></span>
+						<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down-mobile" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'post-{{p.id}}-down-mobile', 'post-{{p.id}}-down-mobile', 'post-score-{{p.id}}-mobile')" class="ml-2 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></span>
 					{% else %}
 						<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="arrow-{{p.id}}-mobile-down" tabindex="0" class="arrow-mobile-down ml-2 my-0" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
 							<i class="fas fa-arrow-alt-down mx-0" aria-hidden="true"></i>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 5af2e38486..73e285f858 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -70,19 +70,19 @@
 
 				{% elif v %}
 
-				<div id="post-{{p.id}}-up" tabindex="0" data-bs-id-up="{{p.id}}" data-bs-content-type="post" class="mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
+				<div id="post-{{p.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'post-{{p.id}}-up', 'post-{{p.id}}-down', 'post-score-{{p.id}}')" class="mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
 
 				<span id="post-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" data-bs-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
 
-				<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" data-bs-id-down="{{p.id}}" data-bs-content-type="post" class="text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
+				<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'post-{{p.id}}-up', 'post-{{p.id}}-down', 'post-score-{{p.id}}')" class="text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
 
 				{% else %}
 
-				<div id="post-{{p.id}}-up" tabindex="0" class="mx-auto arrow-up" onclick="location.href='/login';"></div>
+				<div id="post-{{p.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'post-{{p.id}}-up', 'post-{{p.id}}-down', 'post-score-{{p.id}}')" class="mx-auto arrow-up" onclick="location.href='/login';"></div>
 
 				<span id="post-{{p.id}}-score-none" class="score"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" data-bs-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
 
-				<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" class="text-muted mx-auto arrow-down" onclick="location.href='/login';"></div>
+				<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'post-{{p.id}}-up', 'post-{{p.id}}-down', 'post-score-{{p.id}}')" class="text-muted mx-auto arrow-down" onclick="location.href='/login';"></div>
 
 				{% endif %}
 
@@ -289,12 +289,12 @@
 				{% elif v %}
 				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
 
-					<span id="post-{{p.id}}-up-mobile" tabindex="0" data-bs-id-up="{{p.id}}" data-bs-content-type="post" class="mr-2 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
+					<span id="post-{{p.id}}-up-mobile" tabindex="0" href="javascript:void(0)" onclick="vote('1', 'post-{{p.id}}-up-mobile', 'post-{{p.id}}-down-mobile', 'post-score-{{p.id}}-mobile')" class="mr-2 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
 					</span>
 
 					<span id="post-score-{{p.id}}-mobile" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
 
-					<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down-mobile" tabindex="0" data-bs-id-down="{{p.id}}" data-bs-content-type="post" class="ml-2 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}">
+					<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down-mobile" tabindex="0" href="javascript:void(0)" onclick="vote('-1', 'post-{{p.id}}-down-mobile', 'post-{{p.id}}-down-mobile', 'post-score-{{p.id}}-mobile')" class="ml-2 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}">
 					</span>
 
 				</li>