Fix

Added icon and combo selection