1 files changed, 8 insertions, 0 deletions
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index ab3ef454e1c..f29faeca22d 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -7,6 +7,12 @@ module IconsHelper
   # font-awesome-rails gem, but should we ever use a different icon pack in the
   # future we won't have to change hundreds of method calls.
   def icon(names, options = {})
+    if (options.keys & %w[aria-hidden aria-label data-hidden]).empty?
+      # Add 'aria-hidden' and 'data-hidden' if they are not set in options.
+      options['aria-hidden'] = true
+      options['data-hidden'] = true
+    end
+
     options.include?(:base) ? fa_stacked_icon(names, options) : fa_icon(names, options)
   end
 
@@ -14,6 +20,8 @@ module IconsHelper
     case names
     when "standard"
       names = "key"
+    when "two-factor"
+      names = "key"
     end
 
     options.include?(:base) ? fa_stacked_icon(names, options) : fa_icon(names, options)