Start of export + fix iconization bug in c++