Revert "FW: Revert all recent white UI changes"

This reverts commit 910f52fdee9840e933e022761ae5137968e8560b.

Change-Id: I2c79b71d66aa33836c5320c658cadee93381de92