Merge branch 'Teknocrat-icons'