Re-estructure icons dirs and names (LP: #1173622)