BL-552, BL-375: Remove conditional compile from designer

Also set the correct form icon in the constructor
Merge pull request #130 from phillip-hopper/BL-552

BL-552, BL-375: Remove conditional compile from designer