Merge pull request #8606 from gasolin/issue-835350

Issue 835350 Customize Browser Bookmark via iccsettings, r=bfrancis(cherry picked from commit 72bba6330849f93e55fcddc8be73edda72fb3c9b)