diff --git a/MacPass/MPAddEntryContextMenuDelegate.m b/MacPass/MPAddEntryContextMenuDelegate.m
index 77ef4139..bfd28666 100644
--- a/MacPass/MPAddEntryContextMenuDelegate.m
+++ b/MacPass/MPAddEntryContextMenuDelegate.m
@@ -24,6 +24,7 @@
 #import "MPDocument.h"
 #import "MPDocumentWindowController.h"
 #import "MPActionHelper.h"
+#import "KPKNode+IconImage.h"
 
 #import "KeePassKit/KeePassKit.h"
 
@@ -47,6 +48,8 @@
     NSMenuItem *templateItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:templateMask, entry.title]
                                                                                     action:@selector(createEntryFromTemplate:)
                                                                              keyEquivalent:@""];
+    templateItem.image = [entry.iconImage copy];
+    templateItem.image.size = NSMakeSize(14, 14);
     templateItem.representedObject = entry.uuid;
     [menu addItem:templateItem];
   }
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index cfb83c9f..cb865e50 100644
--- a/MacPass/de.lproj/Localizable.strings
+++ b/MacPass/de.lproj/Localizable.strings
@@ -433,7 +433,7 @@
 "NEW_ENTRY" = "Neuer Eintrag";
 
 /* Submenu to add an entry via template */
-"NEW_ENTRY_WITH_TEMPLATE_%@" = "Neuer Eintrag aus Vorlage %@";
+"NEW_ENTRY_WITH_TEMPLATE_%@" = "mit %@";
 
 /* Action name for a newly created group
    Menu item to create a new group
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index c2ef6a8b..fb29063a 100644
--- a/MacPass/en.lproj/Localizable.strings
+++ b/MacPass/en.lproj/Localizable.strings
@@ -433,7 +433,7 @@
 "NEW_ENTRY" = "New Entry";
 
 /* Submenu to add an entry via template */
-"NEW_ENTRY_WITH_TEMPLATE_%@" = "Create Entry with Template %@";
+"NEW_ENTRY_WITH_TEMPLATE_%@" = "from %@";
 
 /* Action name for a newly created group
    Menu item to create a new group