7 files changed, 7 insertions, 10 deletions
diff --git a/app/views/explore/projects/_filter.html.haml b/app/views/explore/projects/_filter.html.haml
index f02d30081b6..67a88f3d623 100644
--- a/app/views/explore/projects/_filter.html.haml
+++ b/app/views/explore/projects/_filter.html.haml
@@ -1,9 +1,7 @@
 - has_label = local_assigns.fetch(:has_label, false)
-- feature_project_list_filter_bar = Feature.enabled?(:project_list_filter_bar)
-- klass = feature_project_list_filter_bar ? 'gl-ml-3 gl-display-flex gl-flex-grow-1 gl-flex-shrink-1' : 'gl-ml-3'
 - selected = projects_filter_selected(params[:visibility_level])
 
 - if current_user
   - unless has_label
     %span.gl-float-left= _("Visibility:")
-  = gl_redirect_listbox_tag(projects_filter_items, selected, class: klass, data: { right: true })
+  = gl_redirect_listbox_tag(projects_filter_items, selected, class: 'gl-ml-3', data: { right: true })
diff --git a/app/views/explore/projects/_nav.html.haml b/app/views/explore/projects/_nav.html.haml
index 9d7a6f1ccfb..9119026320a 100644
--- a/app/views/explore/projects/_nav.html.haml
+++ b/app/views/explore/projects/_nav.html.haml
@@ -7,5 +7,4 @@
   .nav-controls
     - unless current_user
       = render 'shared/projects/search_form'
-      = render 'shared/projects/dropdown'
     = render 'filter'
diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml
index ae59d9c728b..9585eb76912 100644
--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
@@ -10,5 +10,5 @@
 - else
   = render 'explore/head'
 
-= render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user
+= render 'explore/projects/nav'
 = render 'projects', projects: @projects
diff --git a/app/views/explore/projects/page_out_of_bounds.html.haml b/app/views/explore/projects/page_out_of_bounds.html.haml
index c554cce3dc6..ef5ee2c679e 100644
--- a/app/views/explore/projects/page_out_of_bounds.html.haml
+++ b/app/views/explore/projects/page_out_of_bounds.html.haml
@@ -9,7 +9,7 @@
 - else
   = render 'explore/head'
 
-= render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user
+= render 'explore/projects/nav'
 
 .nothing-here-block
   .svg-content
@@ -18,4 +18,5 @@
       %h5= _("Maximum page reached")
       %p= _("Sorry, you have exceeded the maximum browsable page number. Please use the API to explore further.")
 
-      = link_to _("Back to page %{number}") % { number: @max_page_number }, request.params.merge(page: @max_page_number), class: 'gl-button btn btn-inverted'
+      = render Pajamas::ButtonComponent.new(href: request.params.merge(page: @max_page_number)) do
+        = _("Back to page %{number}") % { number: @max_page_number }
diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml
index a1f2fea5134..ec7eefea264 100644
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -9,5 +9,5 @@
 - else
   = render 'explore/head'
 
-= render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user
+= render 'explore/projects/nav'
 = render 'projects', projects: @projects
diff --git a/app/views/explore/projects/topic.html.haml b/app/views/explore/projects/topic.html.haml
index 76e59a49ed1..7b2c5683482 100644
--- a/app/views/explore/projects/topic.html.haml
+++ b/app/views/explore/projects/topic.html.haml
@@ -25,7 +25,6 @@
   .top-area.gl-pt-2.gl-pb-2
     .nav-controls
       = render 'shared/projects/search_form'
-      = render 'shared/projects/dropdown'
       = render 'filter'
 
   = render 'projects', projects: @projects
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index e23f63b0064..8a92ec31b22 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -9,5 +9,5 @@
 - else
   = render 'explore/head'
 
-= render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user
+= render 'explore/projects/nav'
 = render 'projects', projects: @projects