Merge screenshot and make picture buttons

from @EdwardMoyse  :
 > I think it's getting a bit confusing having a screenshot mode, and this new button. Since they're related, we could possibly put them in a single screenshot menu item ... i.e. you click on screenshot and a menu pops up with two options, enter screenshot mode, directly save a picture.

Indeed !