broken push
slight changes
merge
noIcons option