Revert " - allow removing of close button for avatar and publish window through config.xml"

This reverts commit 961626f46a3e5db0b0e16056742bfec8c5642732.