diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
index cd393c9c8..4068a9aab 100644
--- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
@@ -10,7 +10,7 @@
         </h6>
       </hgroup>
   <form name="cardForm" data-ng-show="card.$isCard()" data-ng-submit="save(cardForm)">
-      <div class="PseudoField">
+      <md-input-container class="PseudoField">
         <var:entity const:name="nbsp"/>
         <label class="PseudoField-label">
           <var:string label:value="Display"/>
@@ -18,8 +18,8 @@
         <p class="PseudoField-inputLike--underline">
           <input type="text" ng-maxlength="30" data-ng-model="card.fn"/>
         </p>
-      </div>
-      <div class="PseudoField">
+      </md-input-container>
+      <md-input-container class="PseudoField">
         <div class="action">
           <var:entity const:name="nbsp"/>
         </div>
@@ -29,7 +29,7 @@
         <p class="PseudoField-inputLike--underline">
           <input type="text" data-ng-model="card.givenname"/>
         </p>
-      </div>
+      </md-input-container>
       <div class="PseudoField">
         <div class="action">
           <var:entity const:name="nbsp"/>
@@ -86,25 +86,22 @@
             <i class="md-icon-remove-circle-outline"><!-- remove --></i>
           </span>
         </div>
-        <div class="PseudoField">
+        <md-input-container class="PseudoField">
           <div class="key">
             <label class="PseudoField-label">
               <var:string label:value="Organization Unit"/>
             </label>
           </div>
           <div class="value">
-            <p class="PseudoField-inputLike--underline">
               <input type="text" label:placeholder="unit" data-ng-model="unit.value"
                      data-sg-focus-on="orgUnit_{{$index}}"/>
-            </p>
-
           </div>
-        </div>
+        </md-input-container>
       </div>
       <div class="attr">
         <div class="value single">
           <span class="button secondary outline tiny" data-ng-click="addOrgUnit()">
-            <i class="md-icon-add-circle-outline"><!-- new --></i>
+            <i class="md-icon-add"><!-- new --></i>
             <var:string label:value="Add Organizational Unit"/>
           </span>
         </div>
@@ -137,7 +134,7 @@
         <div class="attr" data-ng-repeat="category in card.categories">
 
           <div class="PseudoField">
-            <i class="md-icon-remove-circle md-flex"
+            <i class="md-icon-remove-circle-outline"
                data-ng-click="card.$delete('categories', $index)"><!-- remove --></i>
             <div class="key">
               <label class="PseudoField-label md-flex">
@@ -157,7 +154,7 @@
         <div class="attr">
           <div class="value single">
             <span class="button secondary outline tiny" data-ng-click="addCategory()">
-              <i class="md-icon-add-circle-outline"><!-- new --></i>
+              <i class="md-icon-add"><!-- new --></i>
               <var:string label:value="New Category"/>
             </span>
           </div>
@@ -178,6 +175,7 @@
           <select class="text-right" data-ng-model="email.type" data-ng-options="type for type in allEmailTypes">
             <!-- email types -->
           </select>
+
         </div>
         <div class="value">
           <p class="PseudoField-inputLike--underline">
@@ -189,7 +187,7 @@
       <div class="attr">
         <div class="value single">
           <span class="button secondary outline tiny" data-ng-click="addEmail()">
-            <i class="md-icon-add-circle-outline"><!-- new --></i>
+            <i class="md-icon-add"><!-- new --></i>
             <var:string label:value="New Email Address"/>
           </span>
         </div>
@@ -220,7 +218,7 @@
         <div class="attr">
           <div class="value single">
             <span class="button secondary outline tiny" data-ng-click="addPhone()">
-              <i class="md-icon-add-circle-outline"><!-- new --></i>
+              <i class="md-icon-add"><!-- new --></i>
               <var:string label:value="New Phone Number"/>
             </span>
           </div>
@@ -251,7 +249,7 @@
         <div class="attr">
           <div class="value single">
             <span class="button secondary outline tiny" data-ng-click="addUrl()">
-              <i class="md-icon-add-circle-outline"><!-- new --></i>
+              <i class="md-icon-add"><!-- new --></i>
               <var:string label:value="New URL"/>
             </span>
           </div>
@@ -308,7 +306,7 @@
         <div class="attr">
           <div class="value single">
             <span class="button secondary outline tiny" data-ng-click="addAddress()">
-              <i class="md-icon-add-circle-outline"><!-- new --></i>
+              <i class="md-icon-add"><!-- new --></i>
               <var:string label:value="New Address"/>
             </span>
           </div>
@@ -411,7 +409,7 @@
       <div class="attr">
         <div class="value single">
           <span class="button outline secondary tiny" data-ng-click="addMember()">
-            <i class="md-icon-add-circle-outline"><!-- new --></i>
+            <i class="md-icon-add"><!-- new --></i>
             <var:string label:value="Add Member"/>
           </span>
         </div>
diff --git a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox
index 91be19f73..89f934cd3 100644
--- a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox
@@ -28,7 +28,7 @@
       </header>
 
 
-      <section class="content" data-ui-sref="addressbook.card.editor({addressbookId: addressbook.id, cardId: card.id})">
+      <section class="content">
 
         <div class="attr" data-ng-show="card.birthday">
           <div class="key">
diff --git a/UI/WebServerResources/scss/views/ContactsUI.scss b/UI/WebServerResources/scss/views/ContactsUI.scss
index 20f56f361..4ac9e2f62 100644
--- a/UI/WebServerResources/scss/views/ContactsUI.scss
+++ b/UI/WebServerResources/scss/views/ContactsUI.scss
@@ -12,4 +12,7 @@
 // md is overqualifying, we have to do the same to override
 md-content[data-ui-view="card"] {
   background-color: sg-color($sogoPaper, 200);
-}
\ No newline at end of file
+}
+
+// Contact editor
+// ----------------------------------------------------------------------------