partially fixes #31343: some icon paths are still invalid. Also fix update for 1.5. Closes: #31439 [via git-merge-pr]