Make picture INFO correct and complete
Merge pull request #2494 from smfontes/pictureinfo

Make picture tags complete and consistent