all the plastic bottles should be replaced with glass ones, with users using their own dropper.
Agreed, probably best solution for long term storage. When travelling, a little can be poured back into the plastic dropper bottles as it is quite good at handling rude baggage handlers and being crushed by other baggage, while the glass bottle won't fare as well.