Added SafeboxActionType, refactored popup to use it, removed old toolbar icons.