FIX: Change the CC icons; some layout fixes.