initial commit
hdpi for close icon
fixed merge conflict