diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 49b740af04600..b91f68aab5e21 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -7,8 +7,12 @@ class SnippetsController < ApplicationController
   # Allow destroy snippet
   before_filter :authorize_admin_snippet!, only: [:destroy]
 
+  before_filter :set_title
+
   respond_to :html
 
+  layout 'navless'
+
   def index
     @snippets = Snippet.public.fresh.non_expired.page(params[:page]).per(20)
   end
@@ -98,4 +102,8 @@ def authorize_modify_snippet!
   def authorize_admin_snippet!
     return render_404 unless can?(current_user, :admin_personal_snippet, @snippet)
   end
+
+  def set_title
+    @title = 'Snippets'
+  end
 end
diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml
deleted file mode 100644
index e98aba445af28..0000000000000
--- a/app/views/layouts/snippets.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-!!! 5
-%html{ lang: "en"}
-  = render "layouts/head", title: "Snipepts"
-  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
-    = render "layouts/head_panel", title: "Snippets"
-    = render "layouts/flash"
-    %nav.main-nav
-      .container
-        %ul
-          = nav_link(path: 'snippets#user_index', html_options: {class: 'home'}) do
-            = link_to user_snippets_path(current_user), title: "My Snippets" do
-              %i.icon-home
-          = nav_link(path: 'snippets#new') do
-            = link_to new_snippet_path do
-              New snippet
-          = nav_link(path: 'snippets#index') do
-            = link_to snippets_path do
-              Discover snippets
-    .container
-      .content= yield
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index 912f4c77a4bda..cf5c3084dc460 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,8 +1,11 @@
 %h3.page_title
   My Snippets
   %small share code pastes with others out of git repository
-  = link_to new_snippet_path, class: "btn btn-small add_new pull-right", title: "New Snippet" do
-    Add new snippet
+  .pull-right
+    = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
+      Add new snippet
+    = link_to snippets_path, class: "btn btn-small grouped"  do
+      Discover snippets
 
 %hr
 
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 97f7b39877e4f..4301f90f9d6a2 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,8 +1,12 @@
 %h3.page_title
   Public snippets
   %small share code pastes with others out of git repository
-  = link_to new_snippet_path, class: "btn btn-small add_new pull-right", title: "New Snippet" do
-    Add new snippet
+
+  .pull-right
+    = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
+      Add new snippet
+    = link_to user_snippets_path(current_user), class: "btn btn-small grouped"  do
+      My snippets
 
 %hr
 .row