diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 94e1a4d2ec1..e1b5af242f2 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -57,9 +57,7 @@ module IssuablesHelper
 
   def issuable_meta(issuable, project, text)
     output = content_tag :strong, "#{text} #{issuable.to_reference}", class: "identifier"
-    output << " opened "
-    output << time_ago_with_tooltip(issuable.created_at)
-    output << " by "
+    output << " opened #{time_ago_with_tooltip(issuable.created_at, skip_js: true)} by".html_safe
     output << content_tag(:strong) do
       author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "hidden-xs")
       author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "hidden-sm hidden-md hidden-lg")
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index e3df2ec9241..e07ac04baf6 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -5,11 +5,11 @@
 
 .clearfix.detail-page-header
   .issuable-header
-    .issuable-status-box.status-box.status-box-closed{ class: "#{issue_button_visibility(@issue, false)}" }
+    .issuable-status-box.status-box.status-box-closed{ class: issue_button_visibility(@issue, false) }
       = icon('check', class: "hidden-sm hidden-md hidden-lg")
       %span.hidden-xs
         Closed
-    .issuable-status-box.status-box.status-box-open{ class: "#{issue_button_visibility(@issue, true)}"}
+    .issuable-status-box.status-box.status-box-open{ class: issue_button_visibility(@issue, true) }
       = icon('circle-o', class: "hidden-sm hidden-md hidden-lg")
       %span.hidden-xs Open
 
@@ -32,9 +32,9 @@
               = link_to 'New issue', new_namespace_project_issue_path(@project.namespace, @project), title: 'New issue', id: 'new_issue_link'
           - if can?(current_user, :update_issue, @issue)
             %li
-              = link_to 'Reopen issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: " #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
+              = link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
             %li
-              = link_to 'Close issue', issue_path(@issue, issue: {state_event: :close}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "#{issue_button_visibility(@issue, true)}", title: 'Close issue'
+              = link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
             %li
               = link_to 'Edit', edit_namespace_project_issue_path(@project.namespace, @project, @issue)
       - if can?(current_user, :create_issue, @project)
@@ -42,8 +42,8 @@
           = icon('plus')
           New issue
       - if can?(current_user, :update_issue, @issue)
-        = link_to 'Reopen issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
-        = link_to 'Close issue', issue_path(@issue, issue: {state_event: :close}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
+        = link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
+        = link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
         = link_to edit_namespace_project_issue_path(@project.namespace, @project, @issue), class: 'hidden-xs hidden-sm btn btn-nr btn-grouped issuable-edit' do
           = icon('pencil-square-o')
           Edit
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index e78fd2054ce..42a9d463e98 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -1,6 +1,6 @@
 .clearfix.detail-page-header
   .issuable-header
-    .issuable-status-box.status-box{ class: "#{status_box_class(@merge_request)}" }
+    .issuable-status-box.status-box{ class: status_box_class(@merge_request) }
       = icon(@merge_request.state_icon_name, class: "hidden-sm hidden-md hidden-lg")
       %span.hidden-xs
         = @merge_request.state_human_name
diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index caa7b0ec48a..84c8e20ebaa 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -72,7 +72,7 @@ feature 'issue move to another project' do
 
   def edit_issue(issue)
     visit issue_path(issue)
-    page.within('.issuable-actions') { find('.issuable-edit').click }
+    page.within('.issuable-actions') { first(:link, 'Edit').click }
   end
 
   def issue_path(issue)