diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 85059406db..4ac1a0e95b 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -418,7 +418,7 @@ void LyXAction::init()
 		      package: name of latex package (e.g. listings) \n
 		      textclass: name of textclass (e.g. article) \n
 		      menu: name of lfun used in menu  \n
-		      icon: icon of lfun used in toolbar \n
+		      icon: icon of lfun used in toolbar or direct icon name\n
 		      buffer: "name"|"path"|"class"|"vcs-tree-revision"|
                               "vcs-revision"|"vcs-author"|"vcs-date"|"vcs-time"
  * \li Sample: command-sequence info-insert buffer path; info-insert buffer name
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 98fe7d7c9b..acf073aa10 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -410,6 +410,12 @@ void InsetInfo::updateInfo()
 		// installed one is preferred anyway, and all icons that are
 		// embedded in the resources are installed as well.
 		FileName file(to_utf8(icon_name));
+		if (file.onlyFileNameWithoutExt() == "unknown") {
+			string dir = "images";
+			FileName file2(imageLibFileSearch(dir, name_, "svgz,png"));
+			if (!file2.empty())
+				file = file2;
+		}
 		if (!file.exists())
 			break;
 		int percent_scale = 100;