Fix setting names; adjust icon contrast; add more icons