Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

code/modules/admin/view_variables/filterrific.dm

@@ -74,8 +74,7 @@
 		if("modify_icon_value")
 			var/icon/new_icon = input("Pick icon:", "Icon") as null|icon
 			if(new_icon)
-				target.filter_data[params["name"]]["icon"] = new_icon
-				target.update_filters()
+				target.modify_filter(params["name"], list("icon" = new_icon))
 				. = TRUE
 		if("mass_apply")
 			if(!check_rights_for(usr.client, R_FUN))