Unified buttons, changed default icons