Merge remote-tracking branch 'upstream/pull/4963'

diff --combined app/helpers/user_helper.rb
index cc7d7aeca08646175fdde971c821c6a6a3bf3926,5da0a75fd55665bd6e783cefd5ee43a46500aac9..3e779a00c9ea8cdc4b36f3a3c96fbeb31d7af2f6
--- 1/app/helpers/user_helper.rb
--- 2/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@@ -64,7 -64,7 +64,7 @@@ module UserHelpe
                  :size => "36"),
        auth_path(options.merge(:provider => provider)),
        :method => :post,
 -      :class => "auth_button btn btn-light mx-1 p-2 d-block",
 +      :class => "auth_button btn btn-light p-2 d-block",
        :title => t("application.auth_providers.#{name}.title")
      )
    end
@@@ -77,7 -77,7 +77,7 @@@
                  :size => "36") + t("application.auth_providers.#{name}.title"),
        auth_path(options.merge(:provider => provider)),
        :method => :post,
-       :class => "auth_button btn btn-outline-secondary fs-6 border rounded py-2 px-4 d-flex justify-content-center align-items-center",
+       :class => "auth_button btn btn-outline-secondary border py-2 px-4 d-flex justify-content-center align-items-center",
        :title => t("application.auth_providers.#{name}.title")
      )
    end