Resolve #21 - Auto-completion icon (Thanks Morpog!)