remove icon/settings edit and unnecesary code