Bug 1042319 - [Gallery] WIP patch of update gallery edit UI and visuals

Will both buttons look the same? Do we really need two buttons, or could we just do different things in the handler?  I'm not sure which way would be better...