diff --git a/client/css/style.css b/client/css/style.css
index 9596efd7..695a0b75 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -1340,8 +1340,11 @@ button {
 }
 
 #nick.editable button#set-nick,
+#nick.editable #set-nick-tooltip,
 #nick button#submit-nick,
-#nick button#cancel-nick {
+#nick:not(.editable) #save-nick-tooltip,
+#nick button#cancel-nick,
+#nick:not(.editable) #cancel-nick-tooltip {
 	display: none;
 }
 
diff --git a/client/index.html b/client/index.html
index bc3c7e0e..25be00ab 100644
--- a/client/index.html
+++ b/client/index.html
@@ -61,10 +61,9 @@
 						<div class="input">
 							<span id="nick">
 								<span id="nick-value" spellcheck="false"></span><!-- Comments here remove spaces between elements
-								--><button id="set-nick" type="button" title="Set Nick" aria-label="Set nick"></button><!--
-								--><button id="cancel-nick" type="button" title="Cancel Nick" aria-label="Cancel nick"></button><!--
-								--><button id="submit-nick" type="button" title="Submit Nick" aria-label="Submit nick"></button>
-								</span>
+								--><span id="set-nick-tooltip" class="tooltipped tooltipped-e" aria-label="Change nick"><button id="set-nick" type="button" aria-label="Change nick"></button></span><!--
+								--><span id="cancel-nick-tooltip" class="tooltipped tooltipped-e" aria-label="Cancel"><button id="cancel-nick" type="button" aria-label="Cancel"></button></span><!--
+								--><span id="save-nick-tooltip" class="tooltipped tooltipped-e" aria-label="Save"><button id="submit-nick" type="button" aria-label="Save"></button></span>
 							</span>
 							<textarea id="input" class="mousetrap"></textarea>
 							<span class="tooltipped tooltipped-w" aria-label="Send message">