diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 4a5936b..695e345 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -547,11 +547,11 @@ blockquote {
 }
 
 .messageicon{
-float: left;
-font-size: 1.5em;
-padding-right: 0.5em;
-margin-top: -4px;
-color: #999;
+  float: left;
+  font-size: 1.5em;
+  padding-right: 0.5em;
+  margin-top: -4px;
+  color: #999;
 }
 .msg-git-hash{
   font-family:monospace;
@@ -560,7 +560,7 @@ color: #999;
 }
 
 th[data-sort] {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .pr-changes-description
@@ -569,24 +569,30 @@ th[data-sort] {
 }
 
 .readme dd{
-    margin-left:2em;
+  margin-left:2em;
 }
 
 .hidden{
-    display: none;
+  display: none;
 }
 
 .code_table .cell_commit{
-    padding-left:0.5em;
+  padding-left:0.5em;
 }
 
 
 #cal-heatmap {
-    padding:0.5em;
+  padding:0.5em;
 }
 
 .attachment_list p {
-    margin-bottom: 0;
+  margin-bottom: 0;
+}
+
+.btn-group-sm .btn-nopad,
+.btn-nopad {
+  padding: 0rem .375rem!important;
+  margin-left: .5rem !important
 }
 
 /*Our specific responsive overrides*/
diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index 39f279a..3bae9a5 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -40,7 +40,7 @@
 </h2>
 <hr />
 
-<section id="tags">
+<section id="flags">
   <span class="btn-group btn-group-sm issues-tagbar" role="group">
     <a class="btn {%
       if status|lower in ['open', 'true'] %}btn-primary{%
@@ -72,8 +72,8 @@
         milestone=requested_stones,
         status='all') }}" title="Filter issues by status">All</a>
   </span>
-  <span class="oi m-l-2" data-glyph="tag" title="Tags"></span>
   <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
+  <span class="oi m-l-2 btn btn-nopad" data-glyph="tag" title="Tags"></span>
     {% for tag in tag_list %}
       {% if tag in tags %}
         <a class="btn btn-secondary btn-sm {% if tag in tags%}active{% endif %}"
@@ -98,8 +98,8 @@
         {{ tag }}</a>
     {% endfor %}
   </span>
-  <span class="oi m-l-2" data-glyph="target" title="Milestones"></span>
   <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
+  <span class="oi m-l-2 btn btn-nopad" data-glyph="target" title="Milestones"></span>
     {% for stone in milestones %}
       {% if stone in requested_stones %}
         <a class="btn btn-secondary btn-sm {% if stone in requested_stones %}active{% endif %}"