Update: add icons and replay