Reduce spacing between notification icons

They shrunk 2dp, so shall the spacing. Also reduce the battery height
since it got skipped in the initial shrink.

Test: visual
Bug: 77822905
Bug: 74985733
Change-Id: I468536d2bbbcbc1ff0714a817e89e819c4bfc0a1