diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss
index 276191b50..be178db32 100644
--- a/app/assets/stylesheets/custom.scss
+++ b/app/assets/stylesheets/custom.scss
@@ -10,7 +10,6 @@ html {
 
 a, .link, #expander {
   cursor: pointer;
-  text-decoration: underline;
   color: $font-color;
   padding: 0.2em;
 
diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss
index 0dfde456e..fec131d7d 100644
--- a/app/assets/stylesheets/pages.scss
+++ b/app/assets/stylesheets/pages.scss
@@ -221,7 +221,6 @@ $header_nums: 0, 1, 2, 3, 4;
 
 .category_name {
   a:hover {
-    text-decoration: underline;
     color: white;
   }
 }
diff --git a/app/assets/stylesheets/tags_and_categories.scss b/app/assets/stylesheets/tags_and_categories.scss
index 316a60e17..3a26bb5c2 100644
--- a/app/assets/stylesheets/tags_and_categories.scss
+++ b/app/assets/stylesheets/tags_and_categories.scss
@@ -39,6 +39,12 @@
 
 div#v-pills-tab a {
   color: black;
+  text-decoration: none;
+}
+
+div#v-pills-tab a:hover {
+  background: none;
+  font-weight: bold;
 }
 
 .tag-button {
@@ -76,12 +82,23 @@ $categories_dark_color: (
       color: white;
     }
   }
-  a:link#v-pills-#{$name}-tab.active {
+  a#v-pills-#{$name}-tab.active {
+    background: none;
+    color: $color;
+    font-weight: bold;
+  }
+  a#v-pills-#{$name}-tab {
+    i { color: $color; }
+    &:hover {
+      color: $color;
+    }
+  }
+  a#v-pills-#{$name}-tab.active {
     background: none;
     color: $color;
     font-weight: bold;
   }
-  a:link#v-pills-#{$name}-tab {
+  a#v-pills-#{$name}-tab {
     i { color: $color; }
     &:hover {
       color: $color;
@@ -89,7 +106,6 @@ $categories_dark_color: (
   }
   #category-#{$name} {
     color: $color;
-    text-decoration: underline;
   }
   .bg-#{$name} {
     i { color: #{$color} }
@@ -114,12 +130,12 @@ $categories_bright_color: (
       color: black;
     }
   }
-  a:link#v-pills-#{$name}-tab.active {
+  a#v-pills-#{$name}-tab.active {
     background: none;
     color: $color;
     font-weight: bold;
   }
-  a:link#v-pills-#{$name}-tab {
+  a#v-pills-#{$name}-tab {
     i { color: $color; }
     &:hover {
       color: $color;
@@ -127,7 +143,6 @@ $categories_bright_color: (
   }
   #category-#{$name} {
     color: $color;
-    text-decoration: underline;
   }
   .bg-#{$name} {
     i { color: #{$color} }
diff --git a/app/views/profiles/_profile.html.erb b/app/views/profiles/_profile.html.erb
index 86203f9c3..cec0a0056 100644
--- a/app/views/profiles/_profile.html.erb
+++ b/app/views/profiles/_profile.html.erb
@@ -2,7 +2,7 @@
   <% tooltip_empty = !profile.iso_languages.present? && profile.city.nil? && profile.willing_to_travel.nil? && profile.nonprofit.nil? %>
   <% title = render partial: "profiles/profile_tooltip", locals: { profile: profile } %>
   <div class="col-sm-6 col-md-6 col-lg-3 my-3 profile-box">
-    <%= profile_image_link(Profile.find(profile.id)) %>
+    <%= profile_image_link(profile) %>
     <div class="bg--white caption">
       <div class="profile-name">
         <%= link_to profile.fullname, profile_path(profile.id) %>
diff --git a/app/views/profiles/index.html.erb b/app/views/profiles/index.html.erb
index 9a64a020c..f4d03f599 100644
--- a/app/views/profiles/index.html.erb
+++ b/app/views/profiles/index.html.erb
@@ -30,7 +30,7 @@
           <h1><%= t(:title_topic_search, scope: 'profiles.index') %></h1>
         </div>
       </div>
-      <%= render partial: 'shared/category_filter' %>
+      <%= render partial: 'shared/category_filter', category: @category %>
     </div> <!-- tag filter -->
     <!-- <a href="#top"><%= t(:up_to_filter, scope: 'profiles.index') %> <i class='fa fa-filter pr-2'></i> </a> -->
     <hr class="mt-5">
diff --git a/app/views/shared/_category_filter.erb b/app/views/shared/_category_filter.erb
index a90417b4c..05b692b86 100644
--- a/app/views/shared/_category_filter.erb
+++ b/app/views/shared/_category_filter.erb
@@ -3,20 +3,20 @@
     <p id="category_explantation" class="py-2 font-weight-bold"><%= t(:choose_category, scope: 'category') %></p>
     <div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical">
       <% @categories.each do |category| %>
-        <a class="h5 category-link pb-2 <%= "active show" if category.id.to_s == @category.id.to_s %>" id="v-pills-<%= category.short_name %>-tab" data-toggle="pill" href="#v-pills-<%= category.short_name %>" role="tab" aria-controls="v-pills-<%= category.short_name %>" aria-selected="false">
-          <i class="fa fa-circle pr-2 small" id="icon-<%= category.short_name%>"></i><%= category.name %>
-        </a>
+        <%= link_to profiles_path(category_id: category.id),
+                  class: "h5 category-link pb-2 #{'active show' if category.id.to_s == @category.id.to_s}",
+                  id: "v-pills-#{category.short_name}-tab" do %>
+          <i class="fa fa-circle pr-2 small" id="icon-<%= category.short_name %>"></i>
+          <%= category.name %>
+        <% end %>
       <% end %>
     </div>
   </div>
 
   <div class="col-md-8">
-    <p id="tags_explantation" class="py-2 font-weight-bold <%= "d-none" unless params[:category_id] %>"><%= t(:filter, scope: 'category') %></p>
-    <% @categories.each do |category| %>
-      <span id="<%= category.short_name %>" class="btn btn-primary choose_all_tags mb-2 category-search category-search-<%= category.short_name %> <%= "d-none" unless category.id.to_s ==  params[:category_id] %> ">
-        <%= t(:choose_all_button, scope: 'category', category_name: category.name ).html_safe %>
-      </span>
-    <% end %>
+    <p id="tags_explantation" class="py-2 font-weight-bold <%= "d-none" unless params[:category_id] %>">
+      <%= t(:filter, scope: 'category', category_name: @category.name ) %>
+    </p>
     <div class="tab-content mb-3" id="available-tags-box">
       <% @categories.each do |category| %>
         <div style="min-height: 300px" class="tab-pane fade <%= "active show" if category.id.to_s == ( params[:category_id]  || @category.id.to_s )%>" id="v-pills-<%= category.short_name %>" role="tabpanel" aria-labelledby="v-pills-<%= category.short_name %>-tab" >
diff --git a/config/locales/profile.en.yml b/config/locales/profile.en.yml
index d9bcb0ce9..d320efe13 100644
--- a/config/locales/profile.en.yml
+++ b/config/locales/profile.en.yml
@@ -163,8 +163,7 @@ en:
     picture_too_big: " is too big. You cannot upload a file greater than 1MB."
   category:
     title: "Look through all the speakerinnen of the category <b>%{category_name}</b> <i class='fa fa-caret-right' style='font-size: 21px'></i>"
-    filter: "Choose one or more topics from any category:"
-    choose_all_button: "Choose all topics from %{category_name}"
+    filter: "Choose one or more topics from the category: %{category_name}"
     choose_category: "Choose a category:"
     clear_link: "X Clear all"
     choose_button: "Speakers with these topics"