Fix + icon in some places while in darkUI

Change-Id: Id672bbf4095ea6134c079e53b31c34ace2e9d68d
Settings: Remove unnecessary padding from HeadsUpSettings.

Change-Id: I823aa97f32049dc6c6baf6c859c47219952fe454

Conflicts:
	src/com/android/settings/headsup/HeadsUpSettings.java
Revert "Settings: Remove unnecessary padding from HeadsUpSettings."

This reverts commit 9b4988ffcc7554791c871b44344907eb6d06c6f3.