Fix strings and Removal of Unnecessary Icons