HOT FIX: Icons overlapping