Made changes to include icons for tables.