Added an icon to the 'permalink' button
Fix key selection for oddly-shaped keys.

We were only comparing against the primary rectangle; clicks or marquee
selects against keys with secondary rectangles didn't work correctly.