[DF-1785] Bugfixes, EyeDropper