It used to check if icon was not null or iconSize was not empty, which was wrong.


(cherry picked from commit 0d382307)