Bahama mama. Minor fixes to Joshua's icons.