More state indicators

Just saw there were a few more state Indicators left open

Also removed the old closed and open indicators

I was wondering if the merged state should be moved to yellow or blue, since the grey buttons are more of a general-purpose buttons and the original indicator is blue anyway.

But whatever, they are grey for now as the old one was as well :)