Merge branch 'develop' into base-from-develop
change the icon to a more appropriate one
Report details style fix
Merge branch 'develop' into base-from-develop
Fixed the layout of the category
Merge branch 'base-from-develop' into test