fix circular ref
add icons to all table cells