Fixed two dock icons for Mac
Merge remote-tracking branch 'devel/371_fix_two_dock_icons' into devel-master