combine layer type and edit icon when editing (fixes #11411)