icons - no change
Merge branch 'master' of https://github.com/convolutedlogic/armadillo.git
armadillo - added tab toggle shortcut, reordered default top bar