Merge pull request #6686 from MrPetovan/task/frio-change-comment-expand-icon