[tor-commits] [lego/master] Merge branch 'fixed-icons-styleguide'