script tidying & fix icons