specs: update ICONIControls with proper names for the left hand buttons
revert some commits for the master branch
Merge branch 'master' into newshortnames