Merge pull request #476 from naitsirch/master

[master] fallback to default icon_color in collection buttons