#259 fixed z index of some icons