Can we get a subtle indicator that a droid is needed for the current rebirth?

Multiple times I have accidentally sold a droid that was needed for rebirth because it was the least profitable droid and I had forgotten to add a hat to it to indicate “do not sell.”
Maybe just the little green rebirth arrows on the corner or next to the sell button. Maybe highlight the sell button red. Maybe add extra dialog pop up saying, “ya sure? Might be useful to keep.”
It’s especially frustrating because it seems that once you have build a droid for rebirth, or started the rebirth with the droid, and sell it, the blueprint alert doesn’t indicate anymore when the needed blueprint pops up, so your stuck waiting at the sandcrawler again