Better moved AP handling. Icon that shows on black.

Signed-off-by: Tod Fitch <Tod@FitchDesign.com>