Two more buttons and icons for them. Also a bugfix around how the state
of said buttons gets tracked.