Fix generic package icon

And some all/screen style fixes