Merge proposals dependent on lp:~flimm/epidermis/icon-theme-bugfix

lp:~flimm/epidermis/icon-theme-bugfix has no merge proposals.