diff --git a/app/assets/images/pictograms/lock-reset.svg b/app/assets/images/pictograms/lock-reset.svg
new file mode 100644
index 0000000..4744494
--- /dev/null
+++ b/app/assets/images/pictograms/lock-reset.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M12.63,2C18.16,2 22.64,6.5 22.64,12C22.64,17.5 18.16,22 12.63,22C9.12,22 6.05,20.18 4.26,17.43L5.84,16.18C7.25,18.47 9.76,20 12.64,20A8,8 0 0,0 20.64,12A8,8 0 0,0 12.64,4C8.56,4 5.2,7.06 4.71,11H7.47L3.73,14.73L0,11H2.69C3.19,5.95 7.45,2 12.63,2M15.59,10.24C16.09,10.25 16.5,10.65 16.5,11.16V15.77C16.5,16.27 16.09,16.69 15.58,16.69H10.05C9.54,16.69 9.13,16.27 9.13,15.77V11.16C9.13,10.65 9.54,10.25 10.04,10.24V9.23C10.04,7.7 11.29,6.46 12.81,6.46C14.34,6.46 15.59,7.7 15.59,9.23V10.24M12.81,7.86C12.06,7.86 11.44,8.47 11.44,9.23V10.24H14.19V9.23C14.19,8.47 13.57,7.86 12.81,7.86Z" /></svg>
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d2d4ed8..f3f9825 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -32,12 +32,9 @@ module ApplicationHelper
   end
 
   def image_link_to(name, image = nil, options = nil, html_options = nil)
+    return "" if html_options.delete(:unless_current) && (url_for(options) == request.path)
+
     name = svg_tag("pictograms/#{image}.svg#icon") + name if image
-    if html_options.delete(:hide)
-      # NOTE: current_path? does not work for POST
-      visibility = (url_for(options) == request.path) ? 'hidden' : 'visible'
-      html_options.merge!(style: "visibility: #{visibility}") { |k, v1, v2| v1 + v2 }
-    end
     link_to name, options, html_options
   end
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 324f0c6..7fbc3a8 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,9 +16,11 @@
         <%= image_link_to t(:sign_out), "logout", destroy_user_session_path,
               data: { turbo_method: :delete } %>
       <% else %>
-        <%= image_link_to t(:sign_in), "login", new_user_session_path, hide: true %>
         <%= image_link_to t(:register), "account-plus-outline", new_user_registration_path,
-              hide: true %>
+              unless_current: true %>
+        <%= image_link_to t(:recover_password), "lock-reset", new_user_password_path,
+              unless_current: true %>
+        <%= image_link_to t(:sign_in), "login", new_user_session_path, unless_current: true %>
       <% end %>
     </div>
 
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index dbb59c3..2caf1bd 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -2,10 +2,6 @@
   <%= link_to "Log in", new_session_path(resource_name) %><br />
 <% end %>
 
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
-<% end %>
-
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
   <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 324e794..b285d8d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -11,3 +11,4 @@ en:
   register: "Register"
   sign_in: "Sign in"
   sign_out: "Sign out"
+  recover_password: "Recover password"