gear icon for corner

#obamadivs
Merge remote-tracking branch 'origin/matt's-edits' into jacob's-edits