Add the missing GUIDs for icon sets

Fix broken build of 9adb72022757077b34f02766823202e8dc57dfa2

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Empty state should be considered a modification

Fix regression of f3a43285ce052f85fcf43b6fa9fd72f0756ab477

Based on TortoiseSVN revision 24903

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>