Index: openacs-4/packages/categories/www/cadmin/category-links-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-links-view.tcl,v
diff -u -r1.11.2.3 -r1.11.2.4
--- openacs-4/packages/categories/www/cadmin/category-links-view.tcl	20 Dec 2019 21:18:10 -0000	1.11.2.3
+++ openacs-4/packages/categories/www/cadmin/category-links-view.tcl	24 Oct 2022 11:21:54 -0000	1.11.2.4
@@ -84,9 +84,7 @@
 	}
 	delete {
 	    sub_class narrow
-	    display_template {
-		<img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" style="border:0">
-	    }
+	    display_template {<adp:icon name="trash" title="Delete">}
 	    link_url_col delete_url
 	    link_html { title "Delete link" }
 	}
Index: openacs-4/packages/categories/www/cadmin/synonyms-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonyms-view.tcl,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/categories/www/cadmin/synonyms-view.tcl	20 Dec 2019 21:18:10 -0000	1.8.2.2
+++ openacs-4/packages/categories/www/cadmin/synonyms-view.tcl	24 Oct 2022 11:21:55 -0000	1.8.2.3
@@ -78,9 +78,7 @@
 	}
 	delete {
 	    sub_class narrow
-	    display_template {
-		<img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" style="border:0">
-	    }
+	    display_template {<adp:icon name="trash" title="Delete">}
 	    link_url_col delete_url
 	    link_html { title "Delete synonym" }
 	}
Index: openacs-4/packages/categories/www/cadmin/tree-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.tcl,v
diff -u -r1.23.2.2 -r1.23.2.3
--- openacs-4/packages/categories/www/cadmin/tree-view.tcl	29 Aug 2022 14:17:25 -0000	1.23.2.2
+++ openacs-4/packages/categories/www/cadmin/tree-view.tcl	24 Oct 2022 11:21:55 -0000	1.23.2.3
@@ -122,9 +122,7 @@
 
     lappend elements delete {
 	sub_class narrow
-	display_template {
-	    <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" style="border:0">
-	}
+	display_template {<adp:icon name="trash" title="Delete">}
 	link_url_col delete_url
 	link_html { title "#categories.Delete_category_link_title#" }
     }
Index: openacs-4/packages/chat/lib/transcripts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcripts.tcl,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/chat/lib/transcripts.tcl	15 Jul 2022 13:35:12 -0000	1.5.2.4
+++ openacs-4/packages/chat/lib/transcripts.tcl	24 Oct 2022 11:21:55 -0000	1.5.2.5
@@ -53,7 +53,7 @@
             display_template {
                 <if @transcript_delete_p;literal@ true>
                 <a href="@chat_transcripts.delete_url@">
-                <img src="/shared/images/Delete16.gif" alt="#chat.Delete_transcript#">
+                <adp:icon name="trash" title="#chat.Delete_transcript#">
                 </a>
                 </if>
             }
Index: openacs-4/packages/evaluation/lib/tasks-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/tasks-chunk.tcl,v
diff -u -r1.22 -r1.22.2.1
--- openacs-4/packages/evaluation/lib/tasks-chunk.tcl	7 Aug 2017 23:48:10 -0000	1.22
+++ openacs-4/packages/evaluation/lib/tasks-chunk.tcl	24 Oct 2022 11:21:55 -0000	1.22.2.1
@@ -50,7 +50,7 @@
     lappend elements delete \
         [list label "" \
              sub_class narrow \
-             display_template {<img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" style="border:0px" alt="#evaluation-portlet.Delete_task_#">} \
+             display_template {<adp:icon name="trash" title="#evaluation-portlet.Delete_task_#">} \
              link_url_eval {[export_vars -base "${base_url}admin/tasks/task-delete" { grade_id task_id return_url }]} \
              link_html { title "[_ evaluation-portlet.Delete_task_]" }]
     
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v
diff -u -r1.30.2.1 -r1.30.2.2
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	12 Apr 2019 21:28:35 -0000	1.30.2.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	24 Oct 2022 11:21:55 -0000	1.30.2.2
@@ -153,7 +153,7 @@
 lappend elements delete \
     [list label {} \
 	 sub_class narrow \
-	 display_template {<if @simple_p;literal@ true>#evaluation.delete# </if><else><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" style="border:0px" alt=""></else>} \
+	 display_template {<if @simple_p;literal@ true>#evaluation.delete# </if><else><adp:icon name="trash"></else>} \
 	 link_url_eval {[export_vars -base "evaluation-delete" { evaluation_id return_url task_id }]} \
 	 link_html { title "[_ evaluation.Delete_evaluation_]" } \
 	] 
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	7 Aug 2017 23:48:10 -0000	1.17
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	24 Oct 2022 11:21:55 -0000	1.17.2.1
@@ -99,9 +99,9 @@
     if { $live_revision eq "" } {
 	set delete_template "<span style=\"font-style: italic; color: red; font-size: 9pt;\">[_ evaluation.Deleted]</span> <a href=[export_vars -base "distribution-edit" { grade_id {set_task_id_live $task_item_id} }]>[_ evaluation.make_it_live]</a>"
     } elseif { $simple_p } {
-	set delete_template "<a href=\"[export_vars -base "../tasks/task-delete" { task_id grade_id return_url }]\">[_ evaluation-portlet.Delete]</a>"
+	set delete_template "<a href=\"[export_vars -base ../tasks/task-delete { task_id grade_id return_url }]\">[_ evaluation-portlet.Delete]</a>"
     } else {
-	set delete_template "<a href=\"[export_vars -base "../tasks/task-delete" { task_id grade_id return_url }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" style=\"border:0px\" alt=\"\"></a>"
+	set delete_template "<a href=\"[export_vars -base ../tasks/task-delete { task_id grade_id return_url }]\"><adp:icon name=\"trash\"></a>"
     }
     
 }
Index: openacs-4/packages/evaluation/www/admin/grades/grades.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.tcl,v
diff -u -r1.20 -r1.20.2.1
--- openacs-4/packages/evaluation/www/admin/grades/grades.tcl	7 Aug 2017 23:48:10 -0000	1.20
+++ openacs-4/packages/evaluation/www/admin/grades/grades.tcl	24 Oct 2022 11:21:55 -0000	1.20.2.1
@@ -112,9 +112,9 @@
     if { $live_revision eq "" } {
 	set delete_template "<span style=\"font-style: italic; color: red; font-size: 9pt;\">[_ evaluation.Deleted]</span> <a href=[export_vars -base "grades" { {set_grade_id_live $item_id} }]>[_ evaluation.make_it_live]</a>"
     } elseif { $simple_p } {
-	set delete_template "<a href=\"[export_vars -base "grades-delete" { grade_id return_url }]\">[_ evaluation.delete]</a>"
+	set delete_template "<a href=\"[export_vars -base grades-delete { grade_id return_url }]\">[_ evaluation.delete]</a>"
     } else {
-	set delete_template "<a href=\"[export_vars -base "grades-delete" { grade_id return_url }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" style=\"border:0px\" alt=\"\"></a>"
+	set delete_template "<a href=\"[export_vars -base grades-delete { grade_id return_url }]\"><adp:icon name=\"trash\"></a>"
     }
 }
 
Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl	7 Aug 2017 23:48:10 -0000	1.18
+++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl	24 Oct 2022 11:21:55 -0000	1.18.2.1
@@ -51,7 +51,7 @@
 	lappend elements delete \
 		[list label "" \
 		     sub_class narrow \
-		     display_template {<img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" style="border:0" alt="[_ evaluation-portlet.Delete_task_]">} \
+		     display_template {<adp:icon name="trash" title="[_ evaluation-portlet.Delete_task_]">} \
 		     link_url_eval {[export_vars -base "${base_url}admin/tasks/task-delete" { grade_id task_id return_url }]} \
 		     link_html { title "[_ evaluation-portlet.Delete_task_]" }]
 	
Index: openacs-4/packages/xotcl-core/lib/revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/lib/revisions.tcl,v
diff -u -r1.8.2.3 -r1.8.2.4
--- openacs-4/packages/xotcl-core/lib/revisions.tcl	19 Aug 2022 19:51:12 -0000	1.8.2.3
+++ openacs-4/packages/xotcl-core/lib/revisions.tcl	24 Oct 2022 11:21:55 -0000	1.8.2.4
@@ -57,11 +57,7 @@
         sub_class narrow
       }
       version_delete { label "" link_url_col version_delete_link
-        display_template {
-          <img src='/resources/acs-subsite/Delete16.gif' \
-              title='Delete Revision' alt='delete' \
-              width="16" height="16" border="0">
-        }
+        display_template {<adp:icon name="trash" title="Delete Revision">}
         html {align center}
       }
     }
Index: openacs-4/packages/acs-core-docs/www/tutorial-pages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-pages.adp,v
diff -u -r1.6.2.8 -r1.6.2.9
--- openacs-4/packages/acs-core-docs/www/tutorial-pages.adp	27 Apr 2022 16:52:20 -0000	1.6.2.8
+++ openacs-4/packages/acs-core-docs/www/tutorial-pages.adp	24 Oct 2022 11:28:49 -0000	1.6.2.9
@@ -81,9 +81,7 @@
         }
         delete {
             link_url_col delete_url 
-            display_template {
-                &lt;img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0"&gt;
-            }
+            display_template {&lt;adp:icon name="trash"&gt;}
             sub_class narrow
         }
     }
@@ -199,4 +197,4 @@
 			rightLink="tutorial-debug" rightLabel="Next" rightTitle="Debugging and Automated Testing"
 			homeLink="index" homeLabel="Home" 
 			upLink="tutorial" upLabel="Up"> 
-		    
\ No newline at end of file
+		    
Index: openacs-4/packages/acs-core-docs/www/files/tutorial/note-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/files/tutorial/note-list.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-core-docs/www/files/tutorial/note-list.tcl	7 Aug 2017 23:47:54 -0000	1.3
+++ openacs-4/packages/acs-core-docs/www/files/tutorial/note-list.tcl	24 Oct 2022 11:28:49 -0000	1.3.2.1
@@ -15,9 +15,7 @@
 	}
 	delete {
 	    link_url_col delete_url 
-	    display_template {
-		<img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0">
-	    }
+	    display_template {<adp:icon name="trash">}
 	    sub_class narrow
 	}
     }
Index: openacs-4/packages/assessment/www/asm-admin/one-section.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-section.adp,v
diff -u -r1.7 -r1.7.4.1
--- openacs-4/packages/assessment/www/asm-admin/one-section.adp	14 Jul 2015 22:36:43 -0000	1.7
+++ openacs-4/packages/assessment/www/asm-admin/one-section.adp	24 Oct 2022 11:28:49 -0000	1.7.4.1
@@ -44,7 +44,7 @@
   <a href="section-swap?assessment_id=@assessment_id@&amp;sort_order=@sort_order@&amp;direction=up"><img src="/resources/assessment/up.gif" border="0" alt="#assessment.Move_Up#"></a>
 </if>
 
-<a href="section-delete?section_id=@section_id@&amp;assessment_id=@assessment_id@"><img src="/resources/acs-subsite/Delete16.gif" border="0" alt="#assessment.remove_section#"></a>
+<a href="section-delete?section_id=@section_id@&amp;assessment_id=@assessment_id@"><adp:icon name="trash" title="#assessment.remove_section#"></a>
 
 </td></tr>
 </table>      
Index: openacs-4/packages/assessment/www/asm-admin/questions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/questions.adp,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/assessment/www/asm-admin/questions.adp	7 Aug 2017 23:48:04 -0000	1.11
+++ openacs-4/packages/assessment/www/asm-admin/questions.adp	24 Oct 2022 11:28:49 -0000	1.11.2.1
@@ -22,7 +22,7 @@
   <a href="@sections.section_swap_up_url@"><img src="/resources/assessment/up.gif" style="border: 0;" alt="#assessment.Move_Up#"></a>
   </if>
 
-  <a href="@sections.section_delete_url@"><img src="/resources/acs-subsite/Delete16.gif" style="border: 0;" alt="#assessment.remove_section#"></a>
+  <a href="@sections.section_delete_url@"><adp:icon name="trash" title="#assessment.remove_section#"></a>
   <if @sections.max_time_to_complete@ not nil> (#assessment.max_time# @sections.max_time_to_complete@) </if>
   (@sections.points@ #assessment.points#)