Edit icon should be placed next to the "+" one in header and should be the one having the box around the pencil. See this file for reference: https://www.dropbox.com/s/ooknyn2h92tlygo/OWD_07_Email_vpg_V30_0000_.png
In terms of position, this was changed in the wire-frames some time ago. Please see page 3 of mail-main.pdf: https://www.dropbox.com/sh/ygwfxk6chpshxdj/O60wN6xlEH/Apps/Email/mail-main.pdf A new icon was explicitly created for the multi-edit, which we are using. Please bring this up with the UX and graphic design teams who did this; the dev-gaia mailing list is probably the best place to discuss.