diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index 858e12d..a2c34d8 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -2562,9 +2562,9 @@ More information</textarea>
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="dropdown-item '
-                'branch_from_item" data-value="master"><span '
-                'class="fa fa-random"></span> master</a>',
+                '<a class="dropdown-item branch_from_item pointer" '
+                'data-value="master"><span class="fa fa-random">'
+                '</span> master</a>',
                 output_text,
             )
 
@@ -2787,9 +2787,9 @@ More information</textarea>
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="dropdown-item '
-                'branch_from_item" data-value="master"><span '
-                'class="fa fa-random"></span> master</a>',
+                '<a class="dropdown-item branch_from_item pointer" '
+                'data-value="master"><span class="fa fa-random">'
+                '</span> master</a>',
                 output_text,
             )
 
@@ -3104,15 +3104,15 @@ More information</textarea>
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="dropdown-item '
-                'branch_from_item" data-value="master"><span '
-                'class="fa fa-random"></span> master</a>',
+                '<a class="dropdown-item branch_from_item pointer" '
+                'data-value="master"><span class="fa fa-random">'
+                '</span> master</a>',
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="dropdown-item '
-                'branch_from_item" data-value="random_branch"><span '
-                'class="fa fa-random"></span> random_branch</a>',
+                '<a class="dropdown-item branch_from_item pointer" '
+                'data-value="random_branch"><span class="fa fa-random">'
+                '</span> random_branch</a>',
                 output_text,
             )
 
@@ -3206,15 +3206,15 @@ More information</textarea>
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="dropdown-item '
-                'branch_from_item" data-value="master"><span '
-                'class="fa fa-random"></span> master</a>',
+                '<a class="dropdown-item branch_from_item pointer" '
+                'data-value="master"><span class="fa fa-random">'
+                '</span> master</a>',
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="dropdown-item '
-                'branch_from_item" data-value="random_branch"><span '
-                'class="fa fa-random"></span> random_branch</a>',
+                '<a class="dropdown-item branch_from_item pointer" '
+                'data-value="random_branch"><span class="fa fa-random">'
+                '</span> random_branch</a>',
                 output_text,
             )
 
@@ -4775,13 +4775,13 @@ class TestTicketAccessEditPRMetadata(tests.Modeltests):
             " - Pagure</title>",
             output_text,
         )
-        self.assertNotIn(
-            '<a class="btn btn-outline-primary border-0 btn-sm '
-            'issue-metadata-display editmetadatatoggle" '
-            'href="javascript:void(0)">'
-            '<i class="fa fa-fw fa-pencil"></i></a>',
-            output_text,
-        )
+        self.assertIn(
+                '<i class="fa fa-fw fa-pencil"></i></a>',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
+                output_text,
+            )
         self.assertNotIn(
             '<form method="POST" action="/test/pull-request/1/update">',
             output_text,
@@ -4802,10 +4802,10 @@ class TestTicketAccessEditPRMetadata(tests.Modeltests):
                 output_text,
             )
             self.assertIn(
-                '<a class="btn btn-outline-primary border-0 btn-sm '
-                'issue-metadata-display editmetadatatoggle" '
-                'href="javascript:void(0)">'
                 '<i class="fa fa-fw fa-pencil"></i></a>',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
                 output_text,
             )
             self.assertIn(
@@ -4830,10 +4830,10 @@ class TestTicketAccessEditPRMetadata(tests.Modeltests):
                 output_text,
             )
             self.assertIn(
-                '<a class="btn btn-outline-primary border-0 btn-sm '
-                'issue-metadata-display editmetadatatoggle" '
-                'href="javascript:void(0)">'
                 '<i class="fa fa-fw fa-pencil"></i></a>',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
                 output_text,
             )
             self.assertIn(
@@ -4861,12 +4861,13 @@ class TestTicketAccessEditPRMetadata(tests.Modeltests):
                 output_text,
             )
             self.assertIn(
-                '<a class="btn btn-outline-primary border-0 btn-sm '
-                'issue-metadata-display editmetadatatoggle" '
-                'href="javascript:void(0)">'
                 '<i class="fa fa-fw fa-pencil"></i></a>',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
                 output_text,
             )
+
             self.assertIn(
                 '<form method="POST" action="/test/pull-request/1/update">',
                 output_text,
@@ -4890,10 +4891,10 @@ class TestTicketAccessEditPRMetadata(tests.Modeltests):
                 output_text,
             )
             self.assertIn(
-                '<a class="btn btn-outline-primary border-0 btn-sm '
-                'issue-metadata-display editmetadatatoggle" '
-                'href="javascript:void(0)">'
                 '<i class="fa fa-fw fa-pencil"></i></a>',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
                 output_text,
             )
             self.assertIn(
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index 2cf1f85..f63b964 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -842,7 +842,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
         self.assertIn('title="2 Open Issues | 1 Closed Issues', output_text)
         self.assertIn(
             'bg-success" role="progressbar"\n'
-            '                   style="width:67%"\n',
+            '                   data-width="67%"\n',
             output_text,
         )
 
@@ -858,7 +858,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
         self.assertIn('title="2 Open Issues | 1 Closed Issues"', output_text)
         self.assertIn(
             'bg-danger" role="progressbar"\n'
-            '                   style="width:33%"\n',
+            '                   data-width="33%"\n',
             output_text,
         )
 
@@ -1344,7 +1344,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text,
             )
             self.assertNotIn(
-                '<a class="dropdown-item text-danger" href="javascript:void(0)" id="closeticket"\n'
+                '<a class="dropdown-item text-danger pointer" id="closeticket"\n'
                 '                title="Delete this ticket">\n',
                 output_text,
             )
@@ -1356,7 +1356,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertNotIn("function take_issue(){", output_text)
             self.assertNotIn("function drop_issue(){", output_text)
             self.assertNotIn(
-                '<a href="javascript:void(0)" id="take-btn"\n', output_text
+                '<a class="pointer" id="take-btn"\n', output_text
             )
 
         user.username = "pingou"
@@ -1370,7 +1370,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text,
             )
             self.assertIn(
-                '<a class="dropdown-item text-danger" href="javascript:void(0)" id="closeticket"\n'
+                '<a class="dropdown-item text-danger pointer" id="closeticket"\n'
                 '                title="Delete this ticket">\n',
                 output_text,
             )
@@ -1508,7 +1508,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertIn("function take_issue(){", output_text)
             self.assertIn("function drop_issue(){", output_text)
             self.assertIn(
-                '<a href="javascript:void(0)" id="take-btn"\n', output_text
+                '<a class="pointer" id="take-btn"\n', output_text
             )
 
     @patch("pagure.lib.git.update_git")
@@ -1575,7 +1575,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text,
             )
             self.assertNotIn(
-                '<a class="dropdown-item text-danger" href="javascript:void(0)" id="closeticket"\n'
+                '<a class="dropdown-item text-danger pointer" id="closeticket"\n'
                 '                title="Delete this ticket">\n',
                 output_text,
             )
@@ -1587,7 +1587,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertIn("function take_issue(){", output_text)
             self.assertIn("function drop_issue(){", output_text)
             self.assertIn(
-                '<a href="javascript:void(0)" id="take-btn"\n', output_text
+                '<a class="pointer" id="take-btn"\n', output_text
             )
 
     @patch("pagure.lib.git.update_git")
@@ -1651,7 +1651,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text,
             )
             self.assertNotIn(
-                '<a class="dropdown-item text-danger" href="javascript:void(0)" id="closeticket"\n'
+                '<a class="dropdown-item text-danger pointer" id="closeticket"\n'
                 '                title="Delete this ticket">\n',
                 output_text,
             )
@@ -1659,7 +1659,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertNotIn("function take_issue(){", output_text)
             self.assertNotIn("function drop_issue(){", output_text)
             self.assertNotIn(
-                '<a href="javascript:void(0)" id="take-btn"\n', output_text
+                '<a class="pointer" id="take-btn"\n', output_text
             )
 
             # user no ACLs = no metadata form
@@ -1690,7 +1690,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text,
             )
             self.assertNotIn(
-                '<a class="dropdown-item text-danger" href="javascript:void(0)" id="closeticket"\n'
+                '<a class="dropdown-item text-danger pointer" id="closeticket"\n'
                 '                title="Delete this ticket">\n',
                 output_text,
             )
@@ -1702,7 +1702,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertIn("function take_issue(){", output_text)
             self.assertIn("function drop_issue(){", output_text)
             self.assertIn(
-                '<a href="javascript:void(0)" id="take-btn"\n', output_text
+                '<a class="pointer" id="take-btn"\n', output_text
             )
 
             # user has ticket == Sees the metadata
@@ -3764,9 +3764,9 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertIn("<title>test - Pagure</title>", output_text)
             self.assertTrue('<div id="edit">' in output_text)
             self.assertTrue('<section class="edit_comment">' in output_text)
-            self.assertTrue(
-                '<textarea class="form-control" id="update_comment"'
-                in output_text
+            self.assertIn(
+                '<textarea class="form-control width-100per" id="update_comment"',
+                output_text
             )
 
             csrf_token = self.get_csrf(output=output)
@@ -3838,7 +3838,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertIn("Comment added", output_text)
             self.assertNotIn(
                 '<a class="btn btn-outline-primary border-0 btn-sm issue-metadata-display'
-                ' editmetadatatoggle" href="javascript:void(0)" style="display: inline-block;">'
+                ' editmetadatatoggle pointer inline-block">'
                 '<i class="fa fa-fw fa-pencil">',
                 output_text,
             )
@@ -3865,7 +3865,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<a class="btn btn-outline-primary border-0 btn-sm issue-metadata-display'
-                ' editmetadatatoggle" href="javascript:void(0)" style="display: inline-block;">'
+                ' editmetadatatoggle pointer inline-block">'
                 '<i class="fa fa-fw fa-pencil">',
                 output_text,
             )
@@ -3989,7 +3989,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#00ff00">green</span>\n'
+                'data-bg-color="#00ff00">green</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted">sample description</span>',
                 output_text,
@@ -3999,7 +3999,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#ff0000">red1</span>\n'
+                'data-bg-color="#ff0000">red1</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted">lorem ipsum</span>',
                 output_text,
@@ -4224,7 +4224,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#003cff">blue</span>\n'
+                'data-bg-color="#003cff">blue</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted"></span>',
                 output_text,
@@ -4234,7 +4234,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#ff0000">red</span>\n'
+                'data-bg-color="#ff0000">red</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted">lorem ipsum</span>',
                 output_text,
@@ -4260,7 +4260,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#00ff00">green</span>\n'
+                'data-bg-color="#00ff00">green</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted">sample description</span>',
                 output_text,
@@ -4270,7 +4270,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#ff0000">red1</span>\n'
+                'data-bg-color="#ff0000">red1</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted">lorem ipsum</span>',
                 output_text,
@@ -4296,7 +4296,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#ff0000">red2</span>\n'
+                'data-bg-color="#ff0000">red2</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted"></span>',
                 output_text,
@@ -4306,7 +4306,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#ff0000">red3</span>\n'
+                'data-bg-color="#ff0000">red3</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted"></span>',
                 output_text,
@@ -4332,7 +4332,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#ff0000">red2</span>\n'
+                'data-bg-color="#ff0000">red2</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted"></span>',
                 output_text,
@@ -4342,7 +4342,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#ff0000">red3</span>\n'
+                'data-bg-color="#ff0000">red3</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted"></span>',
                 output_text,
@@ -4413,7 +4413,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
             self.assertIn(
                 '<span class="badge badge-info" '
-                'style="background-color:#000">is:red2</span>\n'
+                'data-bg-color="#000">is:red2</span>\n'
                 "                          &nbsp;"
                 '<span class="text-muted"></span>',
                 output_text,
@@ -4595,8 +4595,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.get("/ns/test3/issue/1")
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<a class="btn btn-outline-primary comment_and_close_action" '
-                'data-value="" href="javascript:void(0)">\n'
+                '<a class="btn btn-outline-primary comment_and_close_action pointer" '
+                'data-value="">\n'
                 "                        Comment &amp; Close\n",
                 output.get_data(as_text=True),
             )
diff --git a/tests/test_pagure_flask_ui_issues_acl_checks.py b/tests/test_pagure_flask_ui_issues_acl_checks.py
index 8fd8831..386be2b 100644
--- a/tests/test_pagure_flask_ui_issues_acl_checks.py
+++ b/tests/test_pagure_flask_ui_issues_acl_checks.py
@@ -462,9 +462,9 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
             # the user can do the following things
             # edit metadata
             self.assertIn(
-                '<a class="btn btn-outline-primary border-0 btn-sm issue-metadata-display'
-                ' editmetadatatoggle" href="javascript:void(0)" style="display: inline-block;">'
-                '<i class="fa fa-fw fa-pencil">',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
                 output_text,
             )
 
@@ -707,7 +707,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
 
             # the user can delete the ticket
             self.assertIn(
-                '<a class="dropdown-item text-danger" href="javascript:void(0)" id="closeticket"\n'
+                '<a class="dropdown-item text-danger pointer" id="closeticket"\n'
                 '                title="Delete this ticket">\n',
                 output_text,
             )
@@ -717,9 +717,9 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
             # the user can do the following things
             # edit metadata
             self.assertIn(
-                '<a class="btn btn-outline-primary border-0 btn-sm issue-metadata-display'
-                ' editmetadatatoggle" href="javascript:void(0)" style="display: inline-block;">'
-                '<i class="fa fa-fw fa-pencil">',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
                 output_text,
             )
 
@@ -958,7 +958,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
                 output_text,
             )
             self.assertIn(
-                '<a class="dropdown-item text-danger" href="javascript:void(0)" id="closeticket"\n'
+                '<a class="dropdown-item text-danger pointer" id="closeticket"\n'
                 '                title="Delete this ticket">\n',
                 output_text,
             )
@@ -967,10 +967,11 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
 
             # the user can do the following things
             # edit metadata
+
             self.assertIn(
-                '<a class="btn btn-outline-primary border-0 btn-sm issue-metadata-display'
-                ' editmetadatatoggle" href="javascript:void(0)" style="display: inline-block;">'
-                '<i class="fa fa-fw fa-pencil">',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
                 output_text,
             )
 
diff --git a/tests/test_pagure_flask_ui_issues_open_access.py b/tests/test_pagure_flask_ui_issues_open_access.py
index 23de214..dd99318 100644
--- a/tests/test_pagure_flask_ui_issues_open_access.py
+++ b/tests/test_pagure_flask_ui_issues_open_access.py
@@ -242,7 +242,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests):
             self.assertIn("function take_issue(){", output_text)
             self.assertNotIn("function drop_issue(){", output_text)
             self.assertIn(
-                '<a href="javascript:void(0)" id="take-btn"\n', output_text
+                '<a class="pointer" id="take-btn"\n', output_text
             )
 
             csrf_token = self.get_csrf(output=output)
@@ -353,7 +353,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests):
             self.assertIn("function take_issue(){", output_text)
             self.assertIn("function drop_issue(){", output_text)
             self.assertIn(
-                '<a href="javascript:void(0)" id="take-btn"\n', output_text
+                '<a class="pointer" id="take-btn"\n', output_text
             )
 
     @patch("pagure.lib.git.update_git", MagicMock(return_value=True))
@@ -416,7 +416,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests):
             self.assertIn("function take_issue(){", output_text)
             self.assertNotIn("function drop_issue(){", output_text)
             self.assertIn(
-                '<a href="javascript:void(0)" id="take-btn"\n', output_text
+                '<a class="pointer" id="take-btn"\n', output_text
             )
 
             # user no ACLs = no metadata form
@@ -459,7 +459,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests):
             self.assertIn("function take_issue(){", output_text)
             self.assertIn("function drop_issue(){", output_text)
             self.assertIn(
-                '<a href="javascript:void(0)" id="take-btn"\n', output_text
+                '<a class="pointer" id="take-btn"\n', output_text
             )
 
             # user has ticket == Sees the metadata
@@ -1157,9 +1157,9 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests):
             self.assertIn("<title>test - Pagure</title>", output_text)
             self.assertTrue('<div id="edit">' in output_text)
             self.assertTrue('<section class="edit_comment">' in output_text)
-            self.assertTrue(
-                '<textarea class="form-control" id="update_comment"'
-                in output_text
+            self.assertIn(
+                '<textarea class="form-control width-100per" id="update_comment"',
+                output_text
             )
 
             csrf_token = self.get_csrf(output=output)
@@ -1230,9 +1230,9 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests):
             self.assertNotIn("Successfully edited issue #1\n", output_text)
             self.assertIn("Comment added", output_text)
             self.assertIn(
-                '<a class="btn btn-outline-primary border-0 btn-sm issue-metadata-display'
-                ' editmetadatatoggle" href="javascript:void(0)" style="display: inline-block;">'
-                '<i class="fa fa-fw fa-pencil">',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
                 output_text,
             )
 
@@ -1257,9 +1257,9 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests):
                 "Issue status updated to: Closed (was: Open)", output_text
             )
             self.assertIn(
-                '<a class="btn btn-outline-primary border-0 btn-sm issue-metadata-display'
-                ' editmetadatatoggle" href="javascript:void(0)" style="display: inline-block;">'
-                '<i class="fa fa-fw fa-pencil">',
+                '<a class="btn btn-outline-primary border-0 btn-sm '
+                'issue-metadata-display editmetadatatoggle pointer inline-block'
+                '"><i class="fa fa-fw fa-pencil"></i></a>',
                 output_text,
             )
 
diff --git a/tests/test_pagure_flask_ui_issues_templates.py b/tests/test_pagure_flask_ui_issues_templates.py
index 0495247..ee0e2f4 100644
--- a/tests/test_pagure_flask_ui_issues_templates.py
+++ b/tests/test_pagure_flask_ui_issues_templates.py
@@ -155,15 +155,15 @@ class PagureFlaskIssuesTemplatetests(tests.Modeltests):
             )
             self.assertIn("Issue Templates", output_text)
             self.assertIn(
-                '<a href="javascript:void(0)" class="issue-template dropdown-item" data-value="RFE">RFE</a>',
+                '<a class="issue-template dropdown-item pointer" data-value="RFE">RFE</a>',
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="issue-template dropdown-item" data-value="2018-bid">2018-bid</a>',
+                '<a class="issue-template dropdown-item pointer" data-value="2018-bid">2018-bid</a>',
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="issue-template dropdown-item" data-value="default">default</a>',
+                '<a class="issue-template dropdown-item pointer" data-value="default">default</a>',
                 output_text,
             )
             self.assertIn(
@@ -186,15 +186,15 @@ class PagureFlaskIssuesTemplatetests(tests.Modeltests):
             )
             self.assertIn("Issue Templates", output_text)
             self.assertIn(
-                '<a href="javascript:void(0)" class="issue-template dropdown-item" data-value="RFE">RFE</a>',
+                '<a class="issue-template dropdown-item pointer" data-value="RFE">RFE</a>',
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="issue-template dropdown-item" data-value="2018-bid">2018-bid</a>',
+                '<a class="issue-template dropdown-item pointer" data-value="2018-bid">2018-bid</a>',
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)" class="issue-template dropdown-item" data-value="default">default</a>',
+                '<a class="issue-template dropdown-item pointer" data-value="default">default</a>',
                 output_text,
             )
             self.assertIn(
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 4e2cbe3..d5d2f5c 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -2352,7 +2352,7 @@ class PagureFlaskRepotests(tests.Modeltests):
                 2,
             )
             self.assertIn(
-                '<a href="javascript:void(0)">1 more commits...', output_text
+                '<a class="pointer">1 more commits...', output_text
             )
             self.assertIn(
                 'title="View file as of 4829cf">Šource</a>', output_text
@@ -2386,7 +2386,7 @@ class PagureFlaskRepotests(tests.Modeltests):
                 output_text,
             )
             self.assertIn(
-                '<a href="javascript:void(0)">1 more commits...', output_text
+                '<a class="pointer">1 more commits...', output_text
             )
             self.assertIn(
                 'title="View file as of 000000">Šource</a>', output_text