Index: openacs-4/packages/xowiki/tcl/personal-notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/personal-notification-procs.tcl,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/xowiki/tcl/personal-notification-procs.tcl	9 Apr 2022 11:00:45 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/tcl/personal-notification-procs.tcl	19 Apr 2022 12:29:26 -0000	1.1.2.6
@@ -118,10 +118,10 @@
       append input_fields [subst {<input type="hidden" name="to_user_id" value="$to_user_id">}]
     }
     set btnDefault [::xowiki::CSS class btn-default]
-    return [list link [::xowiki::adp_parse_tags [subst {
+    return [list link [subst {
       <a href="#$id" title="$title" role="button" data-toggle="modal" data-keyboard="false">
       <adp:icon name="$adpicon" aria-hidden="true"></span>
-    }]] dialog [::xowiki::adp_parse_tags [subst {
+    }] dialog [subst {
       <div class="modal fade" id='$id' tabindex="-1" role="dialog">
       <div class="modal-dialog" role="document">
 <form role="form" class="form-vertical" method="post" action="">
@@ -156,7 +156,7 @@
 </form>
       </div><!--modal-dialog-->
       </div><!--modal-->
-    }]]]
+    }]]
   }
 
   personal-notification-messages ad_proc modal_message_dialog_register_submit {
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.542.2.155 -r1.542.2.156
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Apr 2022 17:29:12 -0000	1.542.2.155
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	19 Apr 2022 12:29:26 -0000	1.542.2.156
@@ -4018,7 +4018,7 @@
 
   PageInstance instproc get_form {} {
     # get the (HTML) form of the ::xowiki::PageTemplates/::xowiki::Form
-    return [::xowiki::adp_parse_tags [:get_html_from_content [:get_from_template form]]]
+    return [:get_html_from_content [:get_from_template form]]
   }
 
   PageInstance instproc get_template_object {} {
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -r1.57.2.31 -r1.57.2.32
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	12 Apr 2022 08:45:14 -0000	1.57.2.31
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	19 Apr 2022 12:29:26 -0000	1.57.2.32
@@ -55,42 +55,6 @@
     return $text
   }
 
-  ad_proc adp_parse_tags {HTML} {
-
-    Parse the tags of the provided HTML text.
-     This method is similar to
-     <blockquote>
-         template::adp_compile -string $HTML
-     </blockquote>
-    but it just performs tag substion (and not ADP variable
-    substitution, since this is done differently concerning instance
-    attributes, etc) on the provided HTML chunk.
-
-    @param HTML text containing potentially ADP tags
-    @return HTML text with substituted ADP tags
-  } {
-    #
-    #ns_log notice "adp_parse_tags BEGIN: $HTML"
-    set old_parse_list [expr {[info exists ::template::parse_list] ? $::template::parse_list : ""}]
-    set ::template::parse_list ""
-    #
-    # The following exception handler is just for safety to achieve a
-    # high-level of backward compatibility. In case
-    # "adp_compile_chunk" and or the evaluation of the resulting code
-    # fails, fall back to the original behavior without ADP tag
-    # substitution.
-    #
-    try {
-      template::adp_compile_chunk $HTML
-      set HTML [eval [join $::template::parse_list \n]]
-    } on error {errorMsg} {
-      ad_log warning "adp_parse_tags failed on parsing:\n$HTML"
-    }
-    set ::template::parse_list $old_parse_list
-    #ns_log notice "adp_parse_tags END: $HTML"
-    return $HTML
-  }
-
   ad_proc randomized_indices {-seed length} {
     Produce a list of "length" random numbers between 0 and
     length-1.
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.121 -r1.368.2.122
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	14 Apr 2022 10:11:02 -0000	1.368.2.121
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	19 Apr 2022 12:29:26 -0000	1.368.2.122
@@ -1971,7 +1971,7 @@
     } else {
       set content [:content_header_get]$content
     }
-    set content [::xowiki::adp_parse_tags $content]
+    #set content [::xowiki::adp_parse_tags $content]
 
     #
     # These variables can be influenced via set-parameter.
@@ -1982,7 +1982,7 @@
     # Setup top includeletes and footers.
     #
 
-    set footer [::xowiki::adp_parse_tags [:htmlFooter -content $content]]
+    set footer [:htmlFooter -content $content]
     set top_includelets ""
     set vp [string trim [::$context_package_id get_parameter "top_includelet" ""]]
     if {$vp ne "" && $vp ne "none"} {
Index: openacs-4/packages/xowiki/www/resources/xowiki-bootstrap5-specific.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki-bootstrap5-specific.css,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/www/resources/xowiki-bootstrap5-specific.css	18 Apr 2022 18:00:58 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/www/resources/xowiki-bootstrap5-specific.css	19 Apr 2022 12:29:26 -0000	1.1.2.3
@@ -1,5 +1,5 @@
 /*
- * Appearance of item-buttons based on bootstrap glyphicons.
+ * Appearance of item-buttons based on bootstrap icons
  */
 
 div.xowiki-content a.file-icon,