Fixed problem with removing the icon from a Button (#10543)

Change-Id: Ia119b93643678494db95d36ffe031a44b76ba578