Hey, I'm currently a Lubuntu user but I want to migrate to xubuntu as it's more polished. However there are 2 things that destroy the whole xubuntu beautyness for me. So i want to know how to get rid of them. I'm not afraid of file editing.

1) How to remove ALL disk icons from desktop (all, mounted, not mounted, pendrives etc)?

2) How to make the icon's text to be 2 row like in every other desktop? Because I don't like that "My appli...".

Thanks in advance!