Adding APBS icons, bug fix