diff --git a/app/views/projects/snippets/_actions.html.haml b/app/views/projects/snippets/_actions.html.haml
index 4d5f702637360fd5a61e67d7a1bbe31be0389b29..4a51546942204346dc8d591ba3bf4c1ade0b7b8b 100644
--- a/app/views/projects/snippets/_actions.html.haml
+++ b/app/views/projects/snippets/_actions.html.haml
@@ -1,8 +1,10 @@
 = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: 'btn btn-grouped new-snippet-link', title: "New Snippet" do
   = icon('plus')
-  new snippet
+  New Snippet
 - if can?(current_user, :admin_project_snippet, @snippet)
-  = link_to "remove", namespace_project_snippet_path(@project.namespace, @project, @snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-grouped btn-remove", title: 'Delete Snippet'
+  = link_to namespace_project_snippet_path(@project.namespace, @project, @snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-grouped btn-remove", title: 'Delete Snippet' do
+    = icon('trash-o')
+    Delete
 - if can?(current_user, :update_project_snippet, @snippet)
   = link_to edit_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-grouped snippable-edit" do
     = icon('pencil-square-o')
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index 4f236fcc7e2992497f99539aa5d0ac6ac9df2519..b6a8e68af22f11cfa1df9998770e3a9931d01c72 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -9,6 +9,6 @@
       = @snippet.file_name
     .file-actions
       .btn-group
-        = link_to "raw", raw_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-sm", target: "_blank"
+        = link_to 'Raw', raw_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-sm", target: "_blank"
 
 %div#notes= render "projects/notes/notes_with_form"
diff --git a/app/views/snippets/_actions.html.haml b/app/views/snippets/_actions.html.haml
index a4fdf89a4eeedf160abcb181e7c26b2107addcef..751fafa8942c080af20974b4b3f720dc0aa358a5 100644
--- a/app/views/snippets/_actions.html.haml
+++ b/app/views/snippets/_actions.html.haml
@@ -1,7 +1,10 @@
 = link_to new_snippet_path, class: 'btn btn-grouped new-snippet-link', title: "New Snippet" do
   = icon('plus')
-  new snippet
-= link_to "remove", snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-grouped btn-remove", title: 'Delete Snippet'
+  New Snippet
+- if can?(current_user, :admin_personal_snippet, @snippet)
+  = link_to snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-grouped btn-remove", title: 'Delete Snippet' do
+    = icon('trash-o')
+    Delete
 - if can?(current_user, :update_personal_snippet, @snippet)
   = link_to edit_snippet_path(@snippet), class: "btn btn-grouped snippable-edit" do
     = icon('pencil-square-o')
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 202a43bc57d9ead294f07cde1d980a877c29542d..612d7b65d8d193f46d7abf27cc54d64365429087 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -8,5 +8,5 @@
       = @snippet.file_name
     .file-actions
       .btn-group
-        = link_to "raw", raw_snippet_path(@snippet), class: "btn btn-sm", target: "_blank"
+        = link_to 'Raw', raw_snippet_path(@snippet), class: "btn btn-sm", target: "_blank"
   = render 'shared/snippets/blob'