diff --git a/rhodecode/templates/admin/gists/show.html b/rhodecode/templates/admin/gists/show.html
--- a/rhodecode/templates/admin/gists/show.html
+++ b/rhodecode/templates/admin/gists/show.html
@@ -2,11 +2,15 @@
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('gist')}:${c.gist.gist_access_id} &middot; ${c.rhodecode_name}
+    ${_('Gist')} &middot; ${c.gist.gist_access_id}
+    %if c.rhodecode_name:
+        &middot; ${c.rhodecode_name}
+    %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${_('Gist')} &middot; gist:${c.gist.gist_access_id}
+    ${_('Gist')} &middot; ${c.gist.gist_access_id}
+    / ${_('URL')}: ${c.gist.gist_url()}
 </%def>
 
 <%def name="page_nav()">
@@ -21,7 +25,7 @@
         %if c.rhodecode_user.username != 'default':
         <ul class="links">
           <li>
-             <span>${h.link_to(_(u'Create new gist'), h.url('new_gist'))}</span>
+              <a href="${h.url('new_gist')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_(u'Create New Gist')}</a>
           </li>
         </ul>
         %endif
@@ -33,34 +37,35 @@
                     <div class="stats">
                         <div class="left" style="margin: -4px 0px 0px 0px">
                           %if c.gist.gist_type == 'public':
-                            <div class="ui-btn green badge">${_('Public gist')}</div>
+                            <div class="btn btn-mini btn-success disabled">${_('Public Gist')}</div>
                           %else:
-                            <div class="ui-btn yellow badge">${_('Private gist')}</div>
+                            <div class="btn btn-mini btn-warning disabled">${_('Private Gist')}</div>
                           %endif
                         </div>
-                        <div class="left item ${'' if c.gist.gist_description else 'last'}" style="color: #AAA">
+                        <div class="left item">
+                            ${c.gist.gist_description}
+                        </div>
+                        <div class="left item last" style="color: #AAA">
                          %if c.gist.gist_expires == -1:
                           ${_('Expires')}: ${_('never')}
                          %else:
                           ${_('Expires')}: ${h.age(h.time_to_datetime(c.gist.gist_expires))}
                          %endif
                        </div>
-                       <div class="left item last">
-                            ${c.gist.gist_description}
-                       </div>
+
                        %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.rhodecode_user.user_id:
-                        <div style="float:right;margin:-4px 0px 0px 0px">
+                        <div style="float:right">
                             ${h.form(url('gist', gist_id=c.gist.gist_id),method='delete')}
-                                ${h.submit('remove_gist', _('Delete'),class_="ui-btn red",onclick="return confirm('"+_('Confirm to delete this gist')+"');")}
+                                ${h.submit('remove_gist', _('Delete'),class_="btn btn-mini btn-danger",onclick="return confirm('"+_('Confirm to delete this Gist')+"');")}
                             ${h.end_form()}
                         </div>
                        %endif
                         <div class="buttons">
                           ## only owner should see that
-                          ##%if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.rhodecode_user.user_id:
-                            ##${h.link_to(_('Edit'),h.url(''),class_="ui-btn")}
-                          ##%endif
-                          ${h.link_to(_('Show as raw'),h.url('formatted_gist', gist_id=c.gist.gist_access_id, format='raw'),class_="ui-btn")}
+                          %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.rhodecode_user.user_id:
+                            ${h.link_to(_('Edit'),h.url('edit_gist', gist_id=c.gist.gist_access_id),class_="btn btn-mini")}
+                          %endif
+                          ${h.link_to(_('Show as Raw'),h.url('formatted_gist', gist_id=c.gist.gist_access_id, format='raw'),class_="btn btn-mini")}
                         </div>
                     </div>
 
@@ -80,8 +85,8 @@
                 <div id="${h.FID('G', file.path)}" class="stats" style="border-bottom: 1px solid #DDD;padding: 8px 14px;">
                     <a href="${c.gist.gist_url()}">¶</a>
                     <b style="margin:0px 0px 0px 4px">${file.path}</b>
-                    <div style="float:right">
-                       ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=file.path),class_="ui-btn")}
+                    <div style="float:right; margin: -5px">
+                       ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=file.path),class_="btn btn-mini")}
                     </div>
                 </div>
                 <div class="code-body">