Better packaging with more icons