Added text and icon color logic

Signed-off-by: Norman L. Smith <nls1729@users.noreply.github.com>