Private Keys without master keys

Some other fixes too. New icons from Tango Icon Set. I think I added the change by mdietz too, as part of one of my commits.