background color of source icon white if selected and clear otherwise; minor clean-ups