Some more theme adjustment.

Also fix battery use button on device info to do the right thing.

Change-Id: I663429d5eb15ac4500feabeebd7ad2e3b8238409
3 files changed