Index: openacs-4/packages/calendar/www/cal-item-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v
diff -u -N -r1.42.2.3 -r1.42.2.4
--- openacs-4/packages/calendar/www/cal-item-view.adp	27 Apr 2022 16:41:46 -0000	1.42.2.3
+++ openacs-4/packages/calendar/www/cal-item-view.adp	21 Oct 2022 08:52:50 -0000	1.42.2.4
@@ -92,7 +92,7 @@
       <div class="form-widget">
         <ul>
           <multiple name="attachments">
-              <li><img src="/resources/acs-subsite/attach.png">
+              <li><adp:icon name="paperclip" text="attachment">
                 <a href="@attachments.href@"\">@attachments.label@</a>
                 &nbsp;[<a href="@attachments.detach_url@">#attachments.remove#</a>]
               </li>
Index: openacs-4/packages/calendar/www/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v
diff -u -N -r1.24 -r1.24.2.1
--- openacs-4/packages/calendar/www/view-month-display.adp	7 Aug 2017 23:48:05 -0000	1.24
+++ openacs-4/packages/calendar/www/view-month-display.adp	21 Oct 2022 08:52:50 -0000	1.24.2.1
@@ -42,7 +42,7 @@
                 <a href="@items.event_url@" title="#calendar.goto_items_event_name#">
                   <if @items.time_p;literal@ true>@items.start_time@</if>
                   @items.event_name@
-                  <if @items.num_attachments@ gt 0><img src="/resources/calendar/images/attach.png" alt=""></if>
+                  <if @items.num_attachments@ gt 0><adp:icon name="paperclip" text="attachments"></if>
                   <if @show_calendar_name_p;literal@ true><span class="cal-text-grey-sml"> [@items.calendar_name@]</span></if>
                 </a>
               </div>
Index: openacs-4/packages/calendar/www/view-one-day-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v
diff -u -N -r1.26 -r1.26.2.1
--- openacs-4/packages/calendar/www/view-one-day-display.adp	23 Apr 2018 12:42:01 -0000	1.26
+++ openacs-4/packages/calendar/www/view-one-day-display.adp	21 Oct 2022 08:52:50 -0000	1.26.2.1
@@ -12,7 +12,7 @@
         <td headers="events" style="vertical-align: top; width:80%" class="day-event-1" valign="top">
           <div id="day-entry-box">
             <multiple name="items">
-              <div id="day-entry-@items.rownum@" class="day-entry-item @items.style_class@" style="top: @items.top@@hour_height_units@; height: @items.height@@hour_height_units@; @items.style@"><p><if @items.num_attachments@ gt 0><img src="/resources/calendar/images/attach.png" alt=""></if><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@ <span class='time-span'>@items.event_span@</span></a></p></div>
+              <div id="day-entry-@items.rownum@" class="day-entry-item @items.style_class@" style="top: @items.top@@hour_height_units@; height: @items.height@@hour_height_units@; @items.style@"><p><if @items.num_attachments@ gt 0><adp:icon name="paperclip" text="attachment"></if><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@ <span class='time-span'>@items.event_span@</span></a></p></div>
             </multiple>
           </div><!-- day-entry-box -->
         </td>
Index: openacs-4/packages/calendar/www/view-week-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.adp,v
diff -u -N -r1.21 -r1.21.2.1
--- openacs-4/packages/calendar/www/view-week-display.adp	23 Apr 2018 12:42:01 -0000	1.21
+++ openacs-4/packages/calendar/www/view-week-display.adp	21 Oct 2022 08:52:50 -0000	1.21.2.1
@@ -23,7 +23,7 @@
           <div class="week-entry-box">
             <multiple name="items">
               <div class="week-entry-item @items.style_class@" style="position: absolute; top:@items.top@@hour_height_units@; left: @items.left@@width_units@; height:@items.height@@hour_height_units@;">
-                <p><if @items.num_attachments@ gt 0><img src="/resources/calendar/images/attach.png" alt=""></if><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@ <span class='time-span'>@items.event_span@</span></a></p>
+                <p><if @items.num_attachments@ gt 0><adp:icon name="paperclip" text="attachments"></if><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@ <span class='time-span'>@items.event_span@</span></a></p>
               </div>
             </multiple>
           </div>
Index: openacs-4/packages/calendar/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/index.tcl,v
diff -u -N -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/calendar/www/admin/index.tcl	1 Mar 2019 11:03:03 -0000	1.11.2.1
+++ openacs-4/packages/calendar/www/admin/index.tcl	21 Oct 2022 08:52:50 -0000	1.11.2.2
@@ -33,7 +33,7 @@
         edit {
             label ""
             display_template {
-                <img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" style="border:0">
+                <adp:icon name="edit">
             }
             link_url_eval {[export_vars -base calendar-edit { calendar_id }]}
             sub_class narrow
@@ -61,7 +61,7 @@
             label ""
             display_template {
                 <if @calendars.num_items@ eq 0>
-                  <img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" style="border:0">
+                  <adp:icon name="trash" text="Delete">
                 </if>
             }
             link_url_eval {[export_vars -base calendar-delete { calendar_id }]}
Index: openacs-4/packages/forums/lib/message/row.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.adp,v
diff -u -N -r1.26.2.3 -r1.26.2.4
--- openacs-4/packages/forums/lib/message/row.adp	15 Jul 2019 14:48:36 -0000	1.26.2.3
+++ openacs-4/packages/forums/lib/message/row.adp	21 Oct 2022 08:52:50 -0000	1.26.2.4
@@ -46,7 +46,7 @@
       <div class="attachments">
         <ul>
           <multiple name="attachment_multi">
-            <li><img src="/resources/acs-subsite/attach.png" alt="#attachments.Attachment#"/> @attachment_multi.name@</li>
+            <li><adp:icon name="paperclip" text="#attachments.Attachment#"> @attachment_multi.name@</li>
           </multiple>
         </ul>
       </div>