Adding/renaming a folder in the bookmark manager should not hide the icon.

chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(arv): Now that this is driven by a data model, implement a data model
 //            that handles the loading and the events from the bookmark backend.
 
 /**
  * @typedef {{childIds: Array<string>}}
  *
@@ skipping 461 matching lines @@
     },
     set editing(editing) {
       var oldEditing = this.editing;
       if (oldEditing == editing)
         return;
 
       var url = this.bookmarkNode.url;
       var title = this.bookmarkNode.title;
       var isFolder = bmm.isFolder(this.bookmarkNode);
       var listItem = this;
-      var labelEl = this.firstChild;
-      var urlEl = labelEl.nextSibling;
+      var labelEl = queryRequiredElement('.label-text', this);

[Dan Beam, 2016/10/27 03:56:17]

labelTextEl?

[Peter Kasting, 2016/10/27 06:00:26]

Done.

+      var urlEl = queryRequiredElement('.url', this);
       var labelInput, urlInput;
 
       // Handles enter and escape which trigger reset and commit respectively.
       function handleKeydown(e) {
         // Make sure that the tree does not handle the key.
         e.stopPropagation();
 
         // Calling list.focus blurs the input which will stop editing the list
         // item.
         switch (e.key) {
@@ skipping 44 matching lines @@
         // before deciding if we should exit edit mode.
         var doc = e.target.ownerDocument;
         window.setTimeout(function() {
           var activeElement = doc.hasFocus() && doc.activeElement;
           if (activeElement != urlInput && activeElement != labelInput) {
             listItem.editing = false;
           }
         }, 50);
       }
 
       var doc = this.ownerDocument;

[Dan Beam, 2016/10/27 03:56:17]

can we do

var labelTextEl = queryRequiredElement('.label-text', this);
var urlEl = queryRequiredElement('.url', this);

here instead of up above where you are?  these variables aren't used until later

[Peter Kasting, 2016/10/27 06:00:26]

Done.

       if (editing) {
         this.setAttribute('editing', '');
         this.draggable = false;
 
         labelInput = /** @type {HTMLElement} */(doc.createElement('input'));
         labelInput.placeholder =
             loadTimeData.getString('name_input_placeholder');
         replaceAllChildren(labelEl, labelInput);
         labelInput.value = title;
 
@@ skipping 81 matching lines @@
         }
       }
     }
   };
 
   return {
     BookmarkList: BookmarkList,
     list: /** @type {Element} */(null),  // Set when decorated.
   };
 });