Add compose icon. Fix some background colours.