Add icons and revert some changes