widget image icon modified, code arranged