Merged with Cesar's changes for home icons edition