diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 4d993ec..c4d6f09 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -11,6 +11,21 @@
 </span>
 </TMPL_IF>
 
+<TMPL_IF HAVE_ACTIONS>
+  <div class="btn-group pull-right">
+    <TMPL_IF EDITURL>
+      <a class="btn" href="<TMPL_VAR EDITURL>" rel="nofollow"><i class="icon-edit"></a>
+    </TMPL_IF>
+    <TMPL_IF COMMENTSLINK>
+      <span class="btn"><TMPL_VAR COMMENTSLINK></span>
+    <TMPL_ELSE>
+      <TMPL_IF DISCUSSIONLINK>
+        <span class="btn"><TMPL_VAR DISCUSSIONLINK></span>
+      </TMPL_IF>
+    </TMPL_IF>
+  </div>
+</TMPL_IF>
+
 <h1>
   <TMPL_IF PERMALINK>
     <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
@@ -52,22 +67,6 @@ License: <TMPL_VAR LICENSE>
 </div>
 </TMPL_IF>
 
-<TMPL_IF HAVE_ACTIONS>
-<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
-<ul>
-<TMPL_IF EDITURL>
-<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
-</TMPL_IF>
-<TMPL_IF COMMENTSLINK>
-<li><TMPL_VAR COMMENTSLINK></li>
-<TMPL_ELSE>
-<TMPL_IF DISCUSSIONLINK>
-<li><TMPL_VAR DISCUSSIONLINK></li>
-</TMPL_IF>
-</TMPL_IF>
-</ul>
-<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
 
 <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>