Apollo: Theme style fix again

Change-Id: I5c266763ca705e544cd52569c032b9b6556bb22d