diff --git a/app/decorators/staff/program_session_decorator.rb b/app/decorators/staff/program_session_decorator.rb
index 688b7dd68..b9fc430ef 100644
--- a/app/decorators/staff/program_session_decorator.rb
+++ b/app/decorators/staff/program_session_decorator.rb
@@ -13,9 +13,9 @@ def state_label(large: false, state: nil)
 
   def confirmation_notes_link
     return '' unless object.confirmation_notes?
-    id = h.dom_id(object, 'notes')
+
     h.link_to h.event_staff_program_session_path(object.event, object) do
-      h.content_tag(:i, '', class: 'fa fa-file')
+      h.content_tag(:i, '', class: 'bi bi-file-text')
     end
   end
 
diff --git a/app/helpers/website_helper.rb b/app/helpers/website_helper.rb
index 6b48bf5ad..53c384343 100644
--- a/app/helpers/website_helper.rb
+++ b/app/helpers/website_helper.rb
@@ -19,7 +19,7 @@ def legend_with_docs(title)
 
   def link_to_docs(anchor)
     link_to(DOCS_PAGE + "##{anchor}", target: "_blank") do
-      content_tag("i", nil, class: "fa fa-fw fa-question-circle")
+      content_tag('i', nil, class: 'bi bi-question-circle')
     end
   end
 end
diff --git a/config/initializers/simple_form/popover_icon_component.rb b/config/initializers/simple_form/popover_icon_component.rb
index d5209a9c9..3b1c3ce20 100644
--- a/config/initializers/simple_form/popover_icon_component.rb
+++ b/config/initializers/simple_form/popover_icon_component.rb
@@ -21,7 +21,7 @@ def icon
         return if popover_content.blank?
         template.capture do
           template.content_tag(:a, class:'btn btn-icon hint-btn popover-trigger', data: { target: popover_selector }) do
-            template.content_tag(:i, '', class: 'fa fa-fw fa-question-circle')
+            template.content_tag(:i, '', class: 'bi bi-question-circle')
           end
         end.html_safe
       end