diff --git a/app/styles/app/components/buttons.sass b/app/styles/app/components/buttons.sass
index bde80e4e..14192d8c 100644
--- a/app/styles/app/components/buttons.sass
+++ b/app/styles/app/components/buttons.sass
@@ -84,13 +84,16 @@ $button-border-color: #d4d4d4
   display: none
 
 .button--grey
-  height: 24px
+  height: 22px
   padding: 0 10px 0 10px
   background-color: #696867
   color: #f2f2f2
+  // line-height: 1.45
   font-size: $font-size-small
   border: none
   @extend %border-radius-4px
   &:hover,
   &:active
     background-color: lighten(#696867, 10)
+  &:focus
+    background-color: #696867
diff --git a/app/styles/app/main/log.sass b/app/styles/app/main/log.sass
index bbe0986b..70893a44 100644
--- a/app/styles/app/main/log.sass
+++ b/app/styles/app/main/log.sass
@@ -69,7 +69,7 @@
 .log-header
   height: 44px
   margin: 0
-  padding: .8em
+  padding: .9em .8em .6em
   text-align: right
   background-color: $log-header-bg
   @extend %border-top-4px
@@ -79,17 +79,16 @@
       size: 100%
       repeat: no-repeat
     width: 1.3em
-    height: 1.2em
+    height: 1.1em
     margin-right: 6px
     vertical-align: middle
   .icon--downloadLog
     background-image: inline-image('icons/download-log-icon.svg')
   .icon--removeLog
     background-image: inline-image('icons/remove-log-icon.svg')
-  button
+  a
     margin-left: .4em
 
-
 .log-body
   position: relative
   pre
diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs
index bda35c8e..15cc5ac4 100644
--- a/app/templates/jobs/pre.hbs
+++ b/app/templates/jobs/pre.hbs
@@ -1,7 +1,7 @@
 <section id="log-container" class="log">
   <menu class="log-header">
     {{#if view.canRemoveLog}}
-      <button class="button button--grey open-popup" {{action "removeLogPopup" target=view}}><span class="icon icon--removeLog"></span> Remove Log</button>
+      <a href="#" class="button button--grey open-popup" {{action "removeLogPopup" target=view}}><span class="icon icon--removeLog"></span> Remove Log</a>
     {{/if}}
     <a class="button button--grey" {{bind-attr href="view.plainTextLogUrl"}}><span class="icon icon--downloadLog"></span> Download Log</a>
   </menu>
diff --git a/app/templates/repos/show/actions.hbs b/app/templates/repos/show/actions.hbs
index c262912b..ba47ed3c 100644
--- a/app/templates/repos/show/actions.hbs
+++ b/app/templates/repos/show/actions.hbs
@@ -32,22 +32,6 @@
         {{/if}}
       </li>
     {{/if}}
-    {{#if view.jobIdForLog}}
-      {{#if view.showDownloadLog}}
-        <li class="icon download-log" title="Download Log">
-          <a class="download-log" {{bind-attr href="view.plainTextLogUrl"}}></a>
-        </li>
-      {{/if}}
-    {{/if}}
-    {{! the next if is a hack for refreshing displayRemoveLog when we change
-    views, it sometimes doesn't work properly }}
-    {{#if view.jobIdForLog}}
-      {{#if view.displayRemoveLog}}
-        <li class="icon remove-log" title="Remove Log">
-          <a href="#" name="remove-log-popup" class="open-popup" {{action "removeLogPopup" target=view}}></a>
-        </li>
-      {{/if}}
-    {{/if}}
     {{#if view.displayCodeClimate}}
       <li class="icon code-climate" title="Test Coverage with Code Climate">
         <a href="#" name="code-climate"