BRANCH 4.3: fixed undefined variable error
BRANCH 4.3: fixed look when no icon is specified