Added the "apk" target.
Added icons to group buttons.