diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
index 17229167ee2a..2657329b2865 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
@@ -550,7 +550,9 @@ public static void renderPaginationLinks(PageContext pageContext,
         for (String linkNameIn : linkNames) {
             String[] linkData = links.get(linkNameIn);
             ListTagUtil.write(pageContext, "<button ");
-            ListTagUtil.write(pageContext, "class=\"btn btn-default btn-xs");
+            ListTagUtil.write(pageContext, "class=\"btn btn-default btn-xs ");
+            ListTagUtil.write(pageContext, linkData[0]);
+
             // if the link is disabled...
             if (linkData[1] == null) {
                 ListTagUtil.write(pageContext, " disabled");
@@ -563,11 +565,7 @@ public static void renderPaginationLinks(PageContext pageContext,
             }
             ListTagUtil.write(pageContext, "\" title=\"");
             ListTagUtil.write(pageContext, linkData[3]);
-            ListTagUtil.write(pageContext, "\">");
-            ListTagUtil.write(pageContext, "<i class=\"");
-            ListTagUtil.write(pageContext, linkData[0]);
-            ListTagUtil.write(pageContext, "\"></i>");
-            ListTagUtil.write(pageContext, "</button>");
+            ListTagUtil.write(pageContext, "\"></button>");
         }
         ListTagUtil.write(pageContext, "</div>");
     }