Merge "Update system shortcut icons to filled GM3 versions" into main