Minor icon updates/fixes