Picture viewing/use

When opening a Picture, the only way to close it is to hit the "x" icon. Escape, clicking out of it, etc do not close. Additionally, the trash can is right next to the close icon. I believe this should be moved to prevent risk of accidental deletion or inconvenience at the least.