diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index 09aefffdfe..c139a196d0 100644
Binary files a/interface/resources/fonts/hifi-glyphs.ttf and b/interface/resources/fonts/hifi-glyphs.ttf differ
diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 906e81a08d..250dad7f7f 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -65,6 +65,8 @@ Item {
             anchors.leftMargin: -10
             width: parent.width + 70
             height: 35
+            border.color: hifi.colors.blueHighlight
+            border.width: 0
             TextInput {
                 id: myDisplayNameText
                 // Properties
@@ -86,6 +88,8 @@ Item {
                 // Signals
                 onEditingFinished: {
                     pal.sendToScript({method: 'displayNameUpdate', params: text})
+                    focus = false
+                    myDisplayName.border.width = 0
                 }
             }
             MouseArea {
@@ -93,8 +97,9 @@ Item {
                 acceptedButtons: Qt.LeftButton
                 hoverEnabled: true
                 onClicked: {
+                    myDisplayName.border.width = 3
                     myDisplayNameText.focus ? myDisplayNameText.cursorPosition = myDisplayNameText.positionAt(mouseX, mouseY, TextInput.CursorOnCharacter) : myDisplayNameText.selectAll();
-                    myDisplayNameText.focus = true;
+                    myDisplayNameText.focus = true
                 }
                 onDoubleClicked: {
                     myDisplayNameText.selectAll();
@@ -106,12 +111,12 @@ Item {
             // Edit pencil glyph
             HiFiGlyphs {
                 id: editGlyph
-                text: hifi.glyphs.edit
+                text: hifi.glyphs.editPencil
                 // Size
-                size: thisNameCard.displayTextHeight
+                size: thisNameCard.displayTextHeight*1.5
                 // Anchors
                 anchors.right: parent.right
-                anchors.rightMargin: size/2
+                anchors.rightMargin: 5
                 anchors.verticalCenter: parent.verticalCenter
                 // Style
                 horizontalAlignment: Text.AlignHCenter
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 3438baa217..8fa8fe8514 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -35,6 +35,17 @@ Rectangle {
     // Keep a local list of per-avatar gainSliderValueDBs. Far faster than fetching this data from the server.
     // NOTE: if another script modifies the per-avatar gain, this value won't be accurate!
     property var gainSliderValueDB: ({});
+    
+    // The letterbox used for popup messages
+    LetterboxMessage {
+        id: letterboxMessage
+        z: 999 // Force the popup on top of everything else
+    }
+    function letterbox(message) {
+        letterboxMessage.text = message
+        letterboxMessage.visible = true
+        letterboxMessage.popupRadius = 0
+    }
 
     // This is the container for the PAL
     Rectangle {
@@ -176,8 +187,6 @@ Rectangle {
         TableViewColumn {
             visible: iAmAdmin
             role: "kick"
-            // The hacky spaces used to center text over the button, since I don't know how to apply a margin
-            // to column header text.
             title: "BAN"
             width: actionButtonWidth
             movable: false
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index 7eca1aa725..18bdd89799 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -312,10 +312,11 @@ Item {
         readonly property string error: "="
         readonly property string settings: "@"
         readonly property string trash: "{"
-        readonly property string objectGroup: "&#xe000;"
+        readonly property string objectGroup: "\ue000"
         readonly property string cm: "}"
         readonly property string msvg79: "~"
         readonly property string deg: "\\"
         readonly property string px: "|"
+        readonly property string editPencil: "\ue00d"
     }
 }
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index f8805d3fc4..0381363ef3 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1094,6 +1094,7 @@ void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) {
 
 void AvatarData::setDisplayName(const QString& displayName) {
     _displayName = displayName;
+    DependencyManager::get<NodeList>()->killNodeWithUUID(getSessionUUID());
 
     qCDebug(avatars) << "Changing display name for avatar to" << displayName;
 }