Fixed only square png import + reduced amount of code