Added basic icon support, need custom table widget