Starting to use font-icons + Bug fix on data move