Index: openacs-4/packages/calendar/calendar.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v
diff -u -r1.47.2.11 -r1.47.2.12
--- openacs-4/packages/calendar/calendar.info	15 Jul 2022 08:06:09 -0000	1.47.2.11
+++ openacs-4/packages/calendar/calendar.info	21 Oct 2022 13:20:22 -0000	1.47.2.12
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="2.10.1d3" url="http://openacs.org/repository/download/apm/calendar-2.10.1d3.apm">
+    <version name="2.10.1d4" url="http://openacs.org/repository/download/apm/calendar-2.10.1d4.apm">
         <owner url="mailto:openacs-calendar@dirkgomez.de">Dirk Gomez</owner>
         <summary>Personal and shared event calendars.</summary>
         <release-date>2021-09-15</release-date>
@@ -17,7 +17,7 @@
         <maturity>2</maturity>
         <package_instance_name>#calendar.Calendar#</package_instance_name>
 
-        <provides url="calendar" version="2.10.1d3"/>
+        <provides url="calendar" version="2.10.1d4"/>
         <requires url="attachments" version="0.11"/>
         <requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-events" version="0.6.2d2"/>
Index: openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml	5 Dec 2021 16:13:59 -0000	1.19.2.1
+++ openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml	21 Oct 2022 13:20:22 -0000	1.19.2.2
@@ -74,8 +74,7 @@
   <msg key="goto_items_without_time_event_name">Zu %items_without_time.event_name% gehen</msg>
   <msg key="goto_months_name">Zu %months.name% gehen</msg>
   <msg key="goto_today">Zum heutigen Tag gehen</msg>
-  <msg key="goto_weekday">Zu %days_of_week.day_short% %days_of_week.monthday% gehen
-</msg>
+  <msg key="goto_weekday">Zu %days_of_week.day_short% %days_of_week.monthday% gehen</msg>
   <msg key="Grant">Erteilen</msg>
   <msg key="Grant_Permissions">Berechtigungen erteilen</msg>
   <msg key="Hours">Stunden</msg>
Index: openacs-4/packages/calendar/www/mini-calendar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.adp,v
diff -u -r1.24 -r1.24.2.1
--- openacs-4/packages/calendar/www/mini-calendar.adp	7 Aug 2017 23:48:05 -0000	1.24
+++ openacs-4/packages/calendar/www/mini-calendar.adp	21 Oct 2022 13:20:22 -0000	1.24.2.1
@@ -1,14 +1,14 @@
 <table id="at-a-glance" cellspacing="0" cellpadding="0">
   <caption>
     <if @view@ eq "month">
-      <a href="@prev_year_url@" title="#calendar.prev_year#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_year#"></a>
+      <a href="@prev_year_url@" title="#calendar.prev_year#"><adp:icon name="previous" text="#calendar.prev_year#"></a>
       @curr_date_pretty@
-      <a href="@next_year_url@" title="#calendar.next_year#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_year#" ></a>
+      <a href="@next_year_url@" title="#calendar.next_year#"><adp:icon name="next" text="#calendar.next_year#"></a>
     </if>
     <else>
-      <a href="@prev_month_url@#calendar" title="#calendar.prev_month#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_month#" ></a>
+      <a href="@prev_month_url@#calendar" title="#calendar.prev_month#"><adp:icon name="previous" text="#calendar.prev_month#"></a>
       @curr_date_pretty@
-      <a href="@next_month_url@#calendar" title="#calendar.next_month#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_month#" ></a>
+      <a href="@next_month_url@#calendar" title="#calendar.next_month#"><adp:icon name="next" text="#calendar.next_month#"></a>
     </else>
   </caption>
 
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 -r1.24.2.1 -r1.24.2.2
--- openacs-4/packages/calendar/www/view-month-display.adp	21 Oct 2022 08:52:50 -0000	1.24.2.1
+++ openacs-4/packages/calendar/www/view-month-display.adp	21 Oct 2022 13:20:22 -0000	1.24.2.2
@@ -1,9 +1,7 @@
   <table class="cal-month-table" cellpadding="0" cellspacing="0" border="0" width="90%">
 
     <caption class="cal-table-caption">
-      <a href="@previous_month_url@#calendar" title="#calendar.prev_month#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_month#"></a>
-      &nbsp;@month_string@ @year@&nbsp;
-      <a href="@next_month_url@#calendar" title="#calendar.next_month#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_month#"></a>
+      <a href="@previous_month_url@#calendar" title="#calendar.prev_month#"><adp:icon name="previous"gif" alt="#calendar.prev_month#"></a>&nbsp;@month_string@ @year@&nbsp;<a href="@next_month_url@#calendar" title="#calendar.next_month#"><adp:icon name="next" text="#calendar.next_month#"></a>
     </caption>
 
     <thead>
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 -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/calendar/www/view-week-display.adp	21 Oct 2022 08:52:50 -0000	1.21.2.1
+++ openacs-4/packages/calendar/www/view-week-display.adp	21 Oct 2022 13:20:22 -0000	1.21.2.2
@@ -1,15 +1,13 @@
   <table id="cal-table-week" cellpadding="0" cellspacing="1" border="0" width="@week_width@@width_units@">
     <caption class="cal-table-caption">
-      <a href="@previous_week_url@" title="#calendar.prev_week#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_week#"></a>
-      &nbsp;#calendar.Week_of# @dates@&nbsp;
-      <a href="@next_week_url@" title="#calendar.next_week#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_week#"></a>
+      <a href="@previous_week_url@" title="#calendar.prev_week#"><adp:icon name="previous" text="#calendar.prev_week#"></a>&nbsp;#calendar.Week_of# @dates@&nbsp;<a href="@next_week_url@" title="#calendar.next_week#"><adp:icon name="next" text="#calendar.next_week#"></a>
     </caption>
 
     <thead>
       <tr>
         <th id="hours">#calendar.Hours#</th>
         <multiple name="days_of_week">
-          <th id="wday_@days_of_week.day_num@" style="width:@days_of_week.width@@width_units@">
+          <th id="wday_@days_of_week.day_num@" style="width:@days_of_week.width@@width_units@;">
             <a href="@days_of_week.weekday_url@" title="#calendar.goto_weekday#">@days_of_week.day_short@ @days_of_week.monthday@</a>
           </th>
         </multiple>
@@ -28,12 +26,12 @@
             </multiple>
           </div>
         </td>
-        <td headers="wday_1" class="week-event-1" style="width:@day_width_1@@width_units@">&nbsp;</td>
-        <td headers="wday_2" class="week-event-1" style="width:@day_width_2@@width_units@">&nbsp;</td>
-        <td headers="wday_3" class="week-event-1" style="width:@day_width_3@@width_units@">&nbsp;</td>
-        <td headers="wday_4" class="week-event-1" style="width:@day_width_4@@width_units@">&nbsp;</td>
-        <td headers="wday_5" class="week-event-1" style="width:@day_width_5@@width_units@">&nbsp;</td>
-        <td headers="wday_6" class="week-event-1" style="width:@day_width_6@@width_units@">&nbsp;</td>
+        <td headers="wday_1" class="week-event-1" style="width:@day_width_1@@width_units@;">&nbsp;</td>
+        <td headers="wday_2" class="week-event-1" style="width:@day_width_2@@width_units@;">&nbsp;</td>
+        <td headers="wday_3" class="week-event-1" style="width:@day_width_3@@width_units@;">&nbsp;</td>
+        <td headers="wday_4" class="week-event-1" style="width:@day_width_4@@width_units@;">&nbsp;</td>
+        <td headers="wday_5" class="week-event-1" style="width:@day_width_5@@width_units@;">&nbsp;</td>
+        <td headers="wday_6" class="week-event-1" style="width:@day_width_6@@width_units@;">&nbsp;</td>
       </tr>
       <multiple name="grid">
 		<tr>
Index: openacs-4/packages/calendar/www/resources/calendar.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar.css,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/calendar/www/resources/calendar.css	23 Apr 2018 12:49:35 -0000	1.18
+++ openacs-4/packages/calendar/www/resources/calendar.css	21 Oct 2022 13:20:22 -0000	1.18.2.1
@@ -57,6 +57,11 @@
 	padding: 2px;
 }
 
+#cal-table-week th {
+    white-space:nowrap;
+    font-size:smaller;
+}
+
 /* END Month View  ---------------------------------------------------*/
 
 .cal-input-field {