Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.239.2.87 -r1.239.2.88
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	24 Mar 2022 08:06:49 -0000	1.239.2.87
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	9 Apr 2022 14:57:04 -0000	1.239.2.88
@@ -1768,19 +1768,14 @@
       if {$notification_type ne ""} {
         set notification_text "Subscribe category $category_name in tree $tree_name"
         set notifications_return_url [expr {[info exists return_url] ? $return_url : [ad_return_url]}]
-        set notification_image \
-            "<img style='border: 0px;' src='/resources/xowiki/email.png' \
-            alt='[ns_quotehtml $notification_text]' title='[ns_quotehtml $notification_text]'>"
+        set notification_image "<adp:icon name='envelope' title='[ns_quotehtml $notification_text]'>"
 
         set cat_notif_link [export_vars -base /notifications/request-new \
                                 {{return_url $notifications_return_url} \
                                      {pretty_name $notification_text} \
                                      {type_id $notification_type} \
                                      {object_id $category_id}}]
-        append entry "<a href='[ns_quotehtml $cat_notif_link]'> " \
-            "<img style='border: 0px;' src='/resources/xowiki/email.png' " \
-            "alt='[ns_quotehtml $notification_text]' title='[ns_quotehtml $notification_text]'>" </a>
-
+        append entry "<a href='[ns_quotehtml $cat_notif_link]'> " $notification_image </a>
       }
       lappend entries $entry
     }
Index: openacs-4/packages/xowiki/tcl/tree-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/tree-procs.tcl,v
diff -u -r1.23.2.18 -r1.23.2.19
--- openacs-4/packages/xowiki/tcl/tree-procs.tcl	24 Mar 2022 08:06:49 -0000	1.23.2.18
+++ openacs-4/packages/xowiki/tcl/tree-procs.tcl	9 Apr 2022 14:57:04 -0000	1.23.2.19
@@ -644,12 +644,18 @@
   TreeRenderer=bootstrap3-folders proc render {{-properties ""} tree} {
     set jsTree [string trimright [next] ", \n"]
     set id [$tree id]
-    set options ""
+    set options [list "enableLinks: true"]
     # see list of possible icons: https://github.com/jonmiles/bootstrap-treeview
-    lappend options \
-        "expandIcon: 'glyphicon glyphicon-none'" \
-        "collapseIcon: 'glyphicon glyphicon-folder-open'" \
-        "enableLinks: true"
+    if {[::xowiki::CSS toolkit] eq "bootstrap5"} {
+      lappend options \
+          "expandIcon: 'glyphicon glyphicon-none'" \
+          "collapseIcon: 'bi bi-folder2-open'"
+      #"expandIcon: 'bi bi-folder'"
+    } else {
+      lappend options \
+          "expandIcon: 'glyphicon glyphicon-none'" \
+          "collapseIcon: 'glyphicon glyphicon-folder-open'"
+    }
     template::add_body_script -script "\n\$('#$id').treeview({data: \[$jsTree\], [join $options ,] });"
     return "<div id='$id'></div>"
   }
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.368.2.117 -r1.368.2.118
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	9 Apr 2022 14:55:41 -0000	1.368.2.117
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	9 Apr 2022 14:57:04 -0000	1.368.2.118
@@ -1936,14 +1936,12 @@
         set notification_type [notification::type::get_type_id -short_name xowiki_notif]
         set notification_text "Subscribe to [::$context_package_id instance_name]"
         set notification_subscribe_link \
-                                         [export_vars -base /notifications/request-new \
-                                              {{return_url $notifications_return_url}
-                                                {pretty_name $notification_text}
-                                                {type_id $notification_type}
-                                                {object_id $context_package_id}}]
-        set notification_image \
-                                         "<img style='border: 0px;' src='/resources/xowiki/email.png' \
-        alt='$notification_text' title='$notification_text'>"
+            [export_vars -base /notifications/request-new \
+                 {{return_url $notifications_return_url}
+                   {pretty_name $notification_text}
+                   {type_id $notification_type}
+                   {object_id $context_package_id}}]
+        set notification_image "<adp:icon name='envelope' title='[ns_quotehtml $notification_text]'>"
       }
     }