Fixes extras icons issues in small
Merges Gaston's Upstream