Fixed bug with possible file rewrite (issue #10604)
Issue #10337 done. Fixed icon for comment button