IDEX-580: improve completion popup
Merge with master
IDEX-580: align image
Merge with master