diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 204950a04b9..e943045e414 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -83,9 +83,9 @@ module ProjectsHelper
 
   def label_filter_class(label_name)
     if selected_label?(label_name)
-      'list-group-item active'
+      'label-filter-item active'
     else
-      'list-group-item'
+      'label-filter-item light'
     end
   end
 
diff --git a/app/views/shared/_project_filter.html.haml b/app/views/shared/_project_filter.html.haml
index abb2a80b7b8..1315c76fbb5 100644
--- a/app/views/shared/_project_filter.html.haml
+++ b/app/views/shared/_project_filter.html.haml
@@ -29,15 +29,16 @@
     - if defined?(labels)
       %fieldset
         %legend Labels
-        %ul.list-group
+        %ul.nav.nav-pills.nav-stacked.nav-small.labels-filter
           - issue_label_names.each do |label_name|
-            = link_to labels_filter_path(label_name), class: label_filter_class(label_name) do
-              %span{class: "label #{label_css_class(label_name)}"}
-                %i.icon-tag
-              = label_name
-              - if selected_label?(label_name)
-                .pull-right
-                  %i.icon-remove
+            %li{class: label_filter_class(label_name)}
+              = link_to labels_filter_path(label_name) do
+                %span{class: "label #{label_css_class(label_name)}"}
+                  %i.icon-tag
+                = label_name
+                - if selected_label?(label_name)
+                  .pull-right
+                    %i.icon-remove
 
     %fieldset
       - if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any?
diff --git a/features/steps/project/project_filter_labels.rb b/features/steps/project/project_filter_labels.rb
index d507d3417e4..5926d69d6c7 100644
--- a/features/steps/project/project_filter_labels.rb
+++ b/features/steps/project/project_filter_labels.rb
@@ -4,19 +4,19 @@ class ProjectFilterLabels < Spinach::FeatureSteps
   include SharedPaths
 
   Then 'I should see "bug" in labels filter' do
-    within ".list-group" do
+    within ".labels-filter" do
       page.should have_content "bug"
     end
   end
 
   And 'I should see "feature" in labels filter' do
-    within ".list-group" do
+    within ".labels-filter" do
       page.should have_content "feature"
     end
   end
 
   And 'I should see "enhancement" in labels filter' do
-    within ".list-group" do
+    within ".labels-filter" do
       page.should have_content "enhancement"
     end
   end