Index: openacs-4/packages/bootstrap-icons/www/sitewide-admin/sample.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bootstrap-icons/www/sitewide-admin/sample.tcl,v
diff -u -r1.1.2.6 -r1.1.2.7
--- openacs-4/packages/bootstrap-icons/www/sitewide-admin/sample.tcl	18 Apr 2022 09:08:38 -0000	1.1.2.6
+++ openacs-4/packages/bootstrap-icons/www/sitewide-admin/sample.tcl	24 Apr 2022 16:17:42 -0000	1.1.2.7
@@ -9,6 +9,16 @@
 
 set title "Sample Icons"
 set context [list [list "." "Boostrap Icons"] $title]
+#
+# Collect generic names
+#
+set generic {}
+foreach iconset [dict keys $::template::icon::map] {
+    lappend generic {*}[dict keys [dict get $::template::icon::map $iconset]]
+}
+#
+# Default iconset
+#
 set iconset [::template::iconset]
 
 # local URL
@@ -42,28 +52,13 @@
     {<tr><th scope="col">Name</th><th scope="col" >bootstrap-icons</th>} \
     [expr {$iconset ne "bootstrap-icons" ? "<th scope='col'>$iconset</th>" : ""}] \
     </tr>\n \
-    [join [lmap name {
-        arrow-down
-        arrow-up
-        checkbox-checked
-        checkbox-unchecked
-        edit
-        eye-closed
-        eye-open
-        file
-        form-info-sign
-        radio-checked
-        radio-unchecked
-        reload
-        text
-        trash
-        watch
-    } {
+    [join [lmap name [lsort -unique [set generic]] {
         set _ <tr>
         append _ [subst {<td scope="row">$name</td><td><adp:icon iconset="bootstrap-icons" name="$name"></td>}]
         if {$iconset ne "bootstrap-icons"} {
-            append _ [subst {<td><adp:icon name="$name"></td>}]
+            append _ [subst {<td><adp:icon name="$name" alt="$name"></td>}]
         }
+        #append _ [subst {<td><adp:icon iconset="classic" name="$name" alt="$name"></td>}]
         append _ </tr>
     }] \n] \
     </table>\n
Index: openacs-4/packages/fa-icons/www/sitewide-admin/sample.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fa-icons/www/sitewide-admin/sample.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/fa-icons/www/sitewide-admin/sample.tcl	18 Apr 2022 09:08:38 -0000	1.1.2.2
+++ openacs-4/packages/fa-icons/www/sitewide-admin/sample.tcl	24 Apr 2022 16:17:42 -0000	1.1.2.3
@@ -9,6 +9,17 @@
 
 set title "Sample Font Awesome Icons"
 set context [list [list "." "Font Awesome Icons"] $title]
+
+#
+# Collect generic names
+#
+set generic {}
+foreach iconset [dict keys $::template::icon::map] {
+    lappend generic {*}[dict keys [dict get $::template::icon::map $iconset]]
+}
+#
+# Default iconset
+#
 set iconset [::template::iconset]
 
 #
@@ -18,33 +29,20 @@
 
 template::head::add_css -href $CSS_URL
 
+
+
 append genericHTML \
     {<table class="table">} \n \
     {<tr><th scope="col">Name</th><th scope="col" >fa-icons</th>} \
     [expr {$iconset ne "fa-icons" ? "<th scope='col'>$iconset</th>" : ""}] \
     </tr>\n \
-    [join [lmap name {
-        arrow-down
-        arrow-up
-        checkbox-checked
-        checkbox-unchecked
-        edit
-        eye-closed
-        eye-open
-        file
-        form-info-sign
-        radio-checked
-        radio-unchecked
-        reload
-        text
-        trash
-        watch
-    } {
+    [join [lmap name [lsort -unique [set generic]] {
         set _ <tr>
         append _ [subst {<td scope="row">$name</td><td><adp:icon iconset="fa-icons" name="$name"></td>}]
         if {$iconset ne "fa-icons"} {
-            append _ [subst {<td><adp:icon name="$name"></td>}]
+            append _ [subst {<td><adp:icon name="$name" alt="$name"></td>}]
         }
+        #append _ [subst {<td><adp:icon iconset="classic" name="$name" alt="$name"></td>}]
         append _ </tr>
     }] \n] \
     </table>\n