Updated with icon actions and changed some strings