diff --git a/nw/core/project.py b/nw/core/project.py
index 4a74e0d0..a7f2cd9b 100644
--- a/nw/core/project.py
+++ b/nw/core/project.py
@@ -937,10 +937,12 @@ class NWProject():
         for oHandle in orphanFiles:
 
             # Look for meta data
+            oName = ""
             if aDoc.openDocument(oHandle, showStatus=False, isOrphan=True):
                 oName, oPath = aDoc.getMeta()
                 aDoc.clearDocument()
-            else:
+
+            if oName == "":
                 nOrph += 1
                 oName = "Orphaned File %d" % nOrph
 
diff --git a/nw/gui/dialogs/configeditor.py b/nw/gui/dialogs/configeditor.py
index e03d7bad..da3158c0 100644
--- a/nw/gui/dialogs/configeditor.py
+++ b/nw/gui/dialogs/configeditor.py
@@ -59,9 +59,10 @@ class GuiConfigEditor(QDialog):
 
         self.setWindowTitle("Preferences")
         self.guiDeco = self.theParent.theTheme.loadDecoration("settings", (64,64))
+        self.outerBox.setSpacing(16)
+
         self.outerBox.addWidget(self.guiDeco, 0, Qt.AlignTop)
         self.outerBox.addLayout(self.innerBox)
-        self.outerBox.setSpacing(16)
         self.setLayout(self.outerBox)
 
         self.tabGeneral = GuiConfigEditGeneralTab(self.theParent)
diff --git a/nw/gui/dialogs/itemeditor.py b/nw/gui/dialogs/itemeditor.py
index 38af48d6..b96d226d 100644
--- a/nw/gui/dialogs/itemeditor.py
+++ b/nw/gui/dialogs/itemeditor.py
@@ -54,15 +54,11 @@ class GuiItemEditor(QDialog):
         self.innerBox = QVBoxLayout()
 
         self.setWindowTitle("Item Settings")
-        self.guiDeco = QLabel()
-        self.guiDeco.setPixmap(
-            self.theParent.theTheme.getPixmap(
-                nwLabels.CLASS_ICON[self.theItem.itemClass], (64,64)
-            )
-        )
+        self.guiDeco = self.theParent.theTheme.loadDecoration("settings", (64,64))
+        self.outerBox.setSpacing(16)
+
         self.outerBox.addWidget(self.guiDeco, 0, Qt.AlignTop)
         self.outerBox.addLayout(self.innerBox)
-        self.outerBox.setSpacing(16)
         self.setLayout(self.outerBox)
 
         self.mainGroup = QGroupBox("Item Settings")
diff --git a/nw/gui/dialogs/projecteditor.py b/nw/gui/dialogs/projecteditor.py
index fd256c3a..6e8b63be 100644
--- a/nw/gui/dialogs/projecteditor.py
+++ b/nw/gui/dialogs/projecteditor.py
@@ -56,13 +56,11 @@ class GuiProjectEditor(QDialog):
         self.innerBox = QVBoxLayout()
 
         self.setWindowTitle("Project Settings")
-        self.guiDeco = QLabel()
-        self.guiDeco.setPixmap(
-            self.theParent.theTheme.getPixmap("cls_novel", (64,64))
-        )
+        self.guiDeco = self.theParent.theTheme.loadDecoration("settings", (64,64))
+        self.outerBox.setSpacing(16)
+
         self.outerBox.addWidget(self.guiDeco, 0, Qt.AlignTop)
         self.outerBox.addLayout(self.innerBox)
-        self.outerBox.setSpacing(16)
         self.setLayout(self.outerBox)
 
         self.theProject.countStatus()
diff --git a/nw/gui/elements/doceditor.py b/nw/gui/elements/doceditor.py
index 96966ddd..78f07c4c 100644
--- a/nw/gui/elements/doceditor.py
+++ b/nw/gui/elements/doceditor.py
@@ -289,7 +289,9 @@ class GuiDocEditor(QTextEdit):
         return
 
     def saveText(self):
-
+        """Save the text currently in the editor to the NWDoc object,
+        and update the NWItem meta data.
+        """
         if self.nwDocument.theItem is None:
             return False
 
@@ -348,7 +350,11 @@ class GuiDocEditor(QTextEdit):
         self.qDocument.blockSignals(True)
         self.qDocument.rootFrame().setFrameFormat(docFormat)
         self.qDocument.blockSignals(False)
-        self.qDocument.contentsChange.emit(0,0,0)
+
+        # The line below causes issues with large documents as it
+        # triggers an early repaint that seems to only render a part of
+        # the document. Leaving it here as a warning for now.
+        # self.qDocument.contentsChange.emit(0,0,0)
 
         return