Athena & Marlin Icons unified