We can unconditionally call into the icon helper methods now that we
removed the g_return_val_if_fail() checks.