Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	16 Dec 2008 17:07:02 -0000	1.28
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	18 Dec 2008 09:39:15 -0000	1.29
@@ -76,7 +76,7 @@
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a> 
-      <a href="@notification_subscribe_link@" class="notification-image-button"></a> &middot; </if>  
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>  
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.82 -r1.83
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	16 Dec 2008 17:07:03 -0000	1.82
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	18 Dec 2008 09:39:28 -0000	1.83
@@ -877,15 +877,15 @@
           set edit_link [$entry_package_id make_link -link $page_link $p edit return_url]
           #my log "page_link=$page_link, edit=$edit_link"
           [t1 last_child] set edit.href $edit_link
-          [t1 last_child] set edit ""
+          [t1 last_child] set edit "&nbsp;"
         }
         if {$allow_delete} {
           if {![info exists p]} {
             set p [::xo::db::CrClass get_instance_from_db -item_id 0 -revision_id $page_id]
           }
           set delete_link [$entry_package_id make_link -link $page_link $p delete return_url]
           [t1 last_child] set delete.href $delete_link
-          [t1 last_child] set delete ""
+          [t1 last_child] set delete "&nbsp;"
         }
         if {$show_heritage} {
           if {$entry_package_id == [my package_id]} {
@@ -2301,7 +2301,7 @@
     }
     if {$link ne ""} {
       set button_class [namespace tail [my info class]]
-      set html "<a class='$button_class' href=\"$link\" alt=\"$alt\" title=\"$title\"></a>"
+      set html "<a class='$button_class' href=\"$link\" alt=\"$alt\" title=\"$title\">&nbsp;</a>"
     }
     return $html
   }
@@ -3078,17 +3078,17 @@
       set __c [t1 last_child]
 
       if {[info exists use_button(edit)]} {
-	$__c set _edit ""
+	$__c set _edit "&nbsp;"
 	$__c set _edit.title #xowiki.edit#
 	$__c set _edit.href [$package_id make_link -link $page_link $p edit return_url] 
       }
       if {[info exists use_button(view)]} {
-	$__c set _view ""
+	$__c set _view "&nbsp;"
 	$__c set _view.title #xowiki.view#
 	$__c set _view.href $view_link
       }
       if {[info exists use_button(delete)]} {
-	$__c set _delete ""
+	$__c set _delete "&nbsp;"
 	$__c set _delete.title #xowiki.delete#
 	$__c set _delete.href [$package_id make_link -link $page_link $p delete return_url] 
       }
Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -N -r1.56 -r1.57
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	16 Dec 2008 17:07:03 -0000	1.56
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	18 Dec 2008 09:39:59 -0000	1.57
@@ -32,7 +32,7 @@
     set title_att ""
     if {[info exists title]}  {append  title_att " title='[string map [list ' {&#39;}] $title]'"}
     if {[info exists target]} {append title_att " target='$target'"}
-    return "<a $title_att [my mk_css_class -additional external] href='$href'>$label<span class='external'></span></a>"
+    return "<a $title_att [my mk_css_class -additional external] href='$href'>$label<span class='external'>&nbsp;</span></a>"
   }
 
   #
@@ -274,7 +274,7 @@
       set internal_href [export_vars -base $internal_href [my extra_query_parameter]]
     }
     if {![info exists embed_options]} {
-      return "<a href='$internal_href' [my mk_css_class -additional file]>$label<span class='file'></span></a></a>"
+      return "<a href='$internal_href' [my mk_css_class -additional file]>$label<span class='file'>&nbsp;</span></a>"
     } else {
       set internal_href [string map [list %2e .] $internal_href]
       return "<embed src='$internal_href' name=\"[my name]\" $embed_options></embed>"
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v
diff -u -N -r1.55 -r1.56
--- openacs-4/packages/xowiki/www/oacs-view.adp	16 Dec 2008 17:07:04 -0000	1.55
+++ openacs-4/packages/xowiki/www/oacs-view.adp	18 Dec 2008 09:40:11 -0000	1.56
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 16 17:44:55 +0100 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Dec 18 10:12:23 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -65,7 +65,7 @@
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a> 
-      <a href="@notification_subscribe_link@" class="notification-image-button"></a> &middot; </if>  
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>  
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v
diff -u -N -r1.34 -r1.35
--- openacs-4/packages/xowiki/www/oacs-view2.adp	16 Dec 2008 17:07:04 -0000	1.34
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	18 Dec 2008 09:40:11 -0000	1.35
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 16 17:44:55 +0100 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Dec 18 10:12:23 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -67,7 +67,7 @@
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a> 
-      <a href="@notification_subscribe_link@" class="notification-image-button"></a> &middot; </if>  
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>  
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v
diff -u -N -r1.29 -r1.30
--- openacs-4/packages/xowiki/www/oacs-view3.adp	16 Dec 2008 17:07:04 -0000	1.29
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	18 Dec 2008 09:40:11 -0000	1.30
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 16 17:44:55 +0100 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Dec 18 10:12:23 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -77,7 +77,7 @@
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a> 
-      <a href="@notification_subscribe_link@" class="notification-image-button"></a> &middot; </if>  
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>  
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book-no-ajax.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	16 Dec 2008 17:07:04 -0000	1.11
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	18 Dec 2008 09:40:11 -0000	1.12
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 16 17:44:55 +0100 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Dec 18 10:12:23 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book.adp,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/xowiki/www/view-book.adp	16 Dec 2008 17:07:04 -0000	1.22
+++ openacs-4/packages/xowiki/www/view-book.adp	18 Dec 2008 09:40:11 -0000	1.23
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 16 17:44:55 +0100 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Dec 18 10:12:23 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v
diff -u -N -r1.51 -r1.52
--- openacs-4/packages/xowiki/www/view-default.adp	16 Dec 2008 17:07:04 -0000	1.51
+++ openacs-4/packages/xowiki/www/view-default.adp	18 Dec 2008 09:40:11 -0000	1.52
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 16 17:44:55 +0100 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Dec 18 10:12:23 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -59,7 +59,7 @@
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a> 
-      <a href="@notification_subscribe_link@" class="notification-image-button"></a> &middot; </if>  
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>  
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v
diff -u -N -r1.41 -r1.42
--- openacs-4/packages/xowiki/www/view-links.adp	16 Dec 2008 17:07:04 -0000	1.41
+++ openacs-4/packages/xowiki/www/view-links.adp	18 Dec 2008 09:40:11 -0000	1.42
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 16 17:44:55 +0100 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Dec 18 10:12:23 +0100 2008 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>
@@ -10,7 +10,7 @@
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a> 
-      <a href="@notification_subscribe_link@" class="notification-image-button"></a> &middot; </if>  
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>  
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/xowiki/www/view-plain.adp	16 Dec 2008 17:07:04 -0000	1.37
+++ openacs-4/packages/xowiki/www/view-plain.adp	18 Dec 2008 09:40:11 -0000	1.38
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 16 17:44:55 +0100 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Dec 18 10:12:23 +0100 2008 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/www/resources/sprite16.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/sprite16.png,v
diff -u -N -r1.1 -r1.2
Binary files differ
Index: openacs-4/packages/xowiki/www/resources/xowiki.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v
diff -u -N -r1.40 -r1.41
--- openacs-4/packages/xowiki/www/resources/xowiki.css	16 Dec 2008 17:07:04 -0000	1.40
+++ openacs-4/packages/xowiki/www/resources/xowiki.css	18 Dec 2008 09:40:11 -0000	1.41
@@ -35,12 +35,14 @@
 
 /* appearance of link types */
 div.xowiki-content span.external {
-    background: transparent url(/resources/xowiki/sprite16.png) -1px -216px no-repeat; 
-    padding-right: 16px;
+    background: transparent url(/resources/xowiki/sprite16.png) -4px -264px no-repeat; 
+    padding-right: 10px;
+    text-decoration: none; /* added here for &nbsp; required in IE */
 }
 div.xowiki-content span.file {
-    background: transparent url(/resources/xowiki/sprite16.png) -4px -234px no-repeat; 
+    background: transparent url(/resources/xowiki/sprite16.png) -4px -286px no-repeat; 
     padding-right: 10px;
+    text-decoration: none;
 }
 div.xowiki-content a.glossary {
     background: url(/resources/xowiki/glossary.gif) right center no-repeat; 
@@ -76,47 +78,56 @@
 */
 /* positions 
    Add16         -1,-0
-   Copy16        -1,-18
-   Delete16      -1,-36
-   Edit16        -1,-54
-   New16         -1,-72
-   Open16        -1,-90
-   Preferences16 -1,-108
-   Properties16  -1,-126
-   Zoom16        -1,-144
-   ZoomIn16      -1,-162
-   ZoomOut16     -1,-180
-   email.png     -1,-198
-   external.png  -1,-216
-   file.png      -1,-234px
+   Copy16        -1,-22
+   Delete16      -1,-44
+   Edit16        -1,-66
+   New16         -1,-88
+   Open16        -1,-110
+   Preferences16 -1,-132
+   Properties16  -1,-154
+   Zoom16        -1,-176
+   ZoomIn16      -1,-198
+   ZoomOut16     -1,-220
+   email.png     -1,-242
+   external.png  -1,-264
+   file.png      -1,-286
+   transparent.png  -1,-308
 */
 div.xowiki-content a.edit-item-button {
-    background: transparent url(/resources/xowiki/sprite16.png) -1px -54px no-repeat; 
+    background: transparent url(/resources/xowiki/sprite16.png) -1px -66px no-repeat; 
     padding-right: 16px;
+    text-decoration: none;
 }
 div.xowiki-content a.delete-item-button {
-    background: transparent url(/resources/xowiki/sprite16.png) -1px -36px no-repeat; 
+    background: transparent url(/resources/xowiki/sprite16.png) -1px -44px no-repeat; 
     padding-right: 16px;
+    text-decoration: none;
 }
 div.xowiki-content a.view-item-button {
-    background: transparent url(/resources/xowiki/sprite16.png) -1px -144px no-repeat; 
+    background: transparent url(/resources/xowiki/sprite16.png) -1px -160px no-repeat; 
     padding-right: 16px;
+    text-decoration: none;
 }
 div.xowiki-content a.create-item-button {
     background: transparent url(/resources/xowiki/sprite16.png) -1px -0px no-repeat; 
     padding-right: 16px;
+    text-decoration: none;
 }
 div.xowiki-content a.copy-item-button {
-    background: transparent url(/resources/xowiki/sprite16.png) -1px -18px no-repeat; 
+    background: transparent url(/resources/xowiki/sprite16.png) -1px -22px no-repeat; 
     padding-right: 16px;
+    text-decoration: none;
+    width: 16px; height: 16px;
 }
 div.xowiki-content a.add-item-button {
     background: transparent url(/resources/xowiki/sprite16.png) -1px -0px no-repeat; 
     padding-right: 16px;
+    text-decoration: none;
 }
 div.xowiki-content a.notification-image-button {
-    background: transparent url(/resources/xowiki/sprite16.png) -1px -202px no-repeat; 
+    background: transparent url(/resources/xowiki/sprite16.png) -4px -248px no-repeat; /* 6px more */
     padding-right: 16px;
+    text-decoration: none;
 }
 
 /* headings */