diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index e1b2ba4..d664157 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -16,12 +16,14 @@
     <span class="btn-group btn-group-sm pull-xs-right" role="group">
     {% if repo.milestones %}
       <a href="{{ url_for(
-          'view_roadmap', username=username, repo=repo.name) }}">
-        <button class="btn btn-default btn-sm">Roadmap</button>
+          'view_roadmap', username=username, repo=repo.name) }}"
+         class="btn btn-secondary btn-sm">
+        Roadmap
       </a>
     {% endif %}
-      <a href="{{ url_for('new_issue', username=username, repo=repo.name) }}">
-        <button class="btn btn-success btn-sm">New Issue</button>
+      <a href="{{ url_for('new_issue', username=username, repo=repo.name) }}"
+         class="btn btn-success btn-sm">
+        New Issue
       </a>
     </span>
   </h2>
diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index 8ca9cee..6e42ebe 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -11,11 +11,13 @@
     {{ issues|count }} Milestones
     <span class="btn-group btn-group-sm pull-xs-right" role="group">
       <a href="{{ url_for(
-          'view_issues', username=username, repo=repo.name) }}">
-        <button class="btn btn-default btn-sm">List</button>
+          'view_issues', username=username, repo=repo.name) }}"
+         class="btn btn-secondary btn-sm">
+        List
       </a>
-      <a href="{{ url_for('new_issue', username=username, repo=repo.name) }}">
-        <button class="btn btn-success btn-sm">New Issue</button>
+      <a href="{{ url_for('new_issue', username=username, repo=repo.name) }}"
+          class="btn btn-success btn-sm">
+        New Issue
       </a>
     </span>
   </h2>