Athena & Marlin Icons unified

![athena](https://f.cloud.github.com/assets/470526/2523369/57d09a1e-b4d0-11e3-8711-f00e37a6cde0.png)![marlin](https://f.cloud.github.com/assets/470526/2523375/5f1637fc-b4d0-11e3-953e-0b90dfe010c6.png)