Fixed labels on category-icon, fixed expense template