diff --git a/shiny/Contacts-v2/components/contacts-create-item.html b/shiny/Contacts-v2/components/contacts-create-item.html
index aaf87a9..b5dcff4 100644
--- a/shiny/Contacts-v2/components/contacts-create-item.html
+++ b/shiny/Contacts-v2/components/contacts-create-item.html
@@ -58,13 +58,13 @@
 			}
 		</style>
 		<polymer-flex-layout align="center"></polymer-flex-layout>
-		<polymer-ui-icon-button icon="{{icon}}" class="{{hidden: active || overlayActive || value || selectedType !== -1}}"></polymer-ui-icon-button>
-		<polymer-ui-icon-button id="activeIcon" icon="{{activeIcon}}" class="{{hidden: !value && selectedType === -1 && !active && !overlayActive}}" on-tap="{{overlayAction}}"></polymer-ui-icon-button>
+		<polymer-ui-icon-button icon="{{icon}}" class="{{ {hidden: active || overlayActive || value || selectedType !== -1} | tokenList}}"></polymer-ui-icon-button>
+		<polymer-ui-icon-button id="activeIcon" icon="{{activeIcon}}" class="{{ {hidden: !value && selectedType === -1 && !active && !overlayActive} | tokenList}}" on-tap="{{overlayAction}}"></polymer-ui-icon-button>
 		<div flex>
 			<input id="input" value="{{value}}" placeholder="{{label}}">
 		</div>
-		<polymer-ui-icon-button icon="close" class="{{hidden: !active && !overlayActive}}" on-tap="{{cancelAction}}"></polymer-ui-icon-button>
-		<polymer-ui-icon-button src="error.png" class="{{hidden: !error || active}}" on-tap="{{errorAction}}"></polymer-ui-icon-button>
+		<polymer-ui-icon-button icon="close" class="{{ {hidden: !active && !overlayActive} | tokenList}}" on-tap="{{cancelAction}}"></polymer-ui-icon-button>
+		<polymer-ui-icon-button src="error.png" class="{{ {hidden: !error || active} | tokenList}}" on-tap="{{errorAction}}"></polymer-ui-icon-button>
 		<polymer-ui-overlay id="typeOverlay" active="{{overlayActive}}" modal backdrop on-polymer-overlay-open="{{overlayOpenAction}}">
 			<polymer-selector selected="{{selectedType}}" on-polymer-activate="{{overlaySelectAction}}">
 				<content></content>