Remove references to relay, add settings icon