Implement text and icon at the same time

Thanks Malinskiy