Icons and Image Editing

Updated the icon set.
Began implementing image editing controls.
Commit

Commit
Conflict Commit

Please work!