[indicator-application] Cleanup and rebuild