Consolidated pkge btn styles and reworked title

Also added AP.Name to icons