I have to say, I'm a bit critical over the unprofessionality regarding the XMB firmwares. I could understand (somewhat) why they would spread multiple PSN icons all over the media cross interface... but why would someone think it's a brilliant idea to have "Search for media server" in every category (given, it's something you'll only ever do once and it's not something you turn on/off constantly)?
Now, there's also the "upload video" icon - which in itself, is useless unless you also downloaded the app itself. If one has no interest in using it, why do I have to have the icon there in the first place? It's as useless as the "Picture App" which is sitting there since its first update and hasn't been used even once.
I can understand that some applications are features, like for example "home" which would be unwise to take away from the interface, but surely, at least the "search for media server" would be better placed somewhere within the settings? Actually, I'm not sure why it's required anyway, since when you have the media server activated, it automatically adds them all anyway, without having to search for them explicitly.