Some work to add the terminal icon on the toolbar
Merge remote-tracking branch 'FezVrasta/master'