[core/theme] fix mergeing of iconsets
[core/theme] fix mergeing of iconsets

iconsets should only overwrite parameters that are *not* set in the main
theme file.

fixes #666

tobi-wan-kenobi/bumblebee-status,tobi-wan-kenobi/bumblebee-status