Added better icon scaling