channel buttons: consistency and better naming, removes icons for now