Fix some problems with scaling icons