fix status and icons