diff --git a/lib/pages/contact/contact_editor.dart b/lib/pages/contact/contact_editor.dart
index 8092c2f..f292008 100644
--- a/lib/pages/contact/contact_editor.dart
+++ b/lib/pages/contact/contact_editor.dart
@@ -33,9 +33,14 @@ class _ContactEditorState extends State<ContactEditor> {
   Contact? _contact;
   @override
   void initState() {
-    if (widget.contact != null) _contact = widget.contact!;
     super.initState();
-    isNew = widget.contact == null;
+    if (widget.contact != null) {
+      isNew = false;
+      _contact = widget.contact;
+      initContact();
+    } else {
+      isNew = true;
+    }
   }
 
   initContact() {
diff --git a/lib/pages/contact/contact_page.dart b/lib/pages/contact/contact_page.dart
index f0c1fae..ed56946 100644
--- a/lib/pages/contact/contact_page.dart
+++ b/lib/pages/contact/contact_page.dart
@@ -52,7 +52,7 @@ class _ContactPageState extends State<ContactPage> {
                               contact: Contact.fromSetting(setting)),
                         )),
                     icon: Icon(
-                      CupertinoIcons.pen,
+                      Icons.edit,
                       color: primaryColor,
                     ))
               ]