Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -r1.70.2.28 -r1.70.2.29
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	20 Dec 2021 17:42:30 -0000	1.70.2.28
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	5 Jan 2022 18:00:00 -0000	1.70.2.29
@@ -867,8 +867,15 @@
         if {[$line exists ${:name}.href]
             && [set href [$line set ${:name}.href]] ne ""
           } {
-          # Use the CSS class from the Field and not from the Line
-          if {[info exists :CSSclass]} {set CSSclass ${:CSSclass}}
+          # Default class is from the field definition. To it we
+          # append the class coming from the line.
+          set CSSclass ${:CSSclass}
+          if {[$line exists ${:name}.CSSclass]} {
+            set lineCSSclass [$line set ${:name}.CSSclass]
+            if {$lineCSSclass ne ""} {
+              append CSSclass " " $lineCSSclass
+            }
+          }
           $line instvar [list ${:name}.title title]
           html::a [:get_local_attributes href title {CSSclass class}] {
             return [next]
Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -r1.11.2.19 -r1.11.2.20
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	25 Dec 2021 16:10:21 -0000	1.11.2.19
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	5 Jan 2022 18:00:00 -0000	1.11.2.20
@@ -547,14 +547,15 @@
         if {[$line exists $__name.href]
             && [set href [$line set $__name.href]] ne ""
           } {
-          # use the CSS class rather from the Field than not the line
           $line instvar [list $__name.title title] [list $__name.target target]
           if {[$line exists $__name.onclick]} {
             set id [::xowiki::Includelet html_id $line]
             template::add_event_listener \
                 -id $id \
                 -script "[$line set $__name.onclick];"
           }
+          # Default class is from the field definition. To it we
+          # append the class coming from the line.
           set CSSclass ${:CSSclass}
           if {[$line exists $__name.CSSclass]} {
             set lineCSSclass [$line set $__name.CSSclass]
Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -r1.38.2.8 -r1.38.2.9
--- openacs-4/packages/xowiki/www/admin/list.tcl	23 Sep 2021 16:09:12 -0000	1.38.2.8
+++ openacs-4/packages/xowiki/www/admin/list.tcl	5 Jan 2022 18:00:00 -0000	1.38.2.9
@@ -84,9 +84,12 @@
             -alt permsissions -label ""
       }
       if {$::with_publish_status} {
-        ImageAnchorField create publish_status -orderby publish_status.src -src "" \
-            -width 8 -height 8 -title "Toggle Publish Status" \
-            -alt "publish status" -label [_ xowiki.publish_status] -html {style "text-align: center;"}
+        AnchorField create publish_status \
+            -CSSclass publish-status-item-button \
+            -orderby publish_status.CSSclass \
+            -label [_ xowiki.publish_status] \
+            -richtext 1 \
+            -html {style "text-align: center;"}
       }
       Field create syndicated -label "RSS" -html {style "text-align: center;"}
       AnchorField create page_order -label [_ xowiki.Page-page_order] -orderby page_order
@@ -148,6 +151,7 @@
               -last_modified $last_modified \
               -syndicated [info exists syndicated($revision_id)] \
               -size [expr {$content_length ne "" ? $content_length : 0}]  \
+              -publish_status "■" \
               -edit "" \
               -edit.href $edit_link \
               -edit.title #xowiki.edit# \
@@ -156,25 +160,27 @@
               -delete.href [export_vars -base [::$package_id package_url] {{delete 1} item_id name return_url}] \
               -delete.title #xowiki.delete#
 
+          set line [::template::t1 last_child]
+
           if {$::individual_permissions} {
-            [::template::t1 last_child] set permissions.href \
+            $line set permissions.href \
                 [export_vars -base permissions {item_id return_url}]
           }
           if {$::with_publish_status} {
             # TODO: this should get some architectural support
             if {$publish_status eq "ready"} {
-              set image active.png
+              set CSSclass green
               set state "production"
             } else {
-              set image inactive.png
+              set CSSclass red
               set state "ready"
             }
-            [::template::t1 last_child] set publish_status.src /resources/xowiki/$image
-            [::template::t1 last_child] set publish_status.href \
-                [export_vars -base [::$package_id package_url]admin/set-publish-state \
-                     {state revision_id return_url}]
+            $line set publish_status "■"
+            $line set publish_status.CSSclass $CSSclass
+            $line set publish_status.title #xowiki.publish_status_make_$state#
+            $line set publish_status.href [export_vars -base $page_link {{m toggle-publish-status} return_url}]
           }
-          [::template::t1 last_child] set page_order $page_order
+          $line set page_order $page_order
         }