Merge proposals dependent on lp:~tomdroid-dev/tomdroid/cleanup_icons

lp:~tomdroid-dev/tomdroid/cleanup_icons has no merge proposals.