Fixed:
   added check of room type name and added window icon
Merge remote-tracking branch 'origin/master'