better icon storage!