merged property item buttons drawing fixes from to_master