diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index 4c77ed633..d02149ce0 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -1013,6 +1013,18 @@ void CFrameBuffer::setIconBasePath(const std::string & iconPath)
 	iconBasePath = iconPath;
 }
 
+std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_type)
+{
+	std::string path, filetype;
+	filetype = "." + file_type;
+	path = std::string(ICONSDIR_VAR) + "/" + icon_name + filetype;
+	if (access(path.c_str(), F_OK))
+		path = iconBasePath + "/" + icon_name + filetype;
+	if (icon_name.find("/", 0) != std::string::npos)
+		path = icon_name;
+	return path;
+}
+
 void CFrameBuffer::getIconSize(const char * const filename, int* width, int *height)
 {
 	*width = 0;
@@ -1110,11 +1122,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
 	/* we cache and check original name */
 	it = icon_cache.find(filename);
 	if(it == icon_cache.end()) {
-		std::string newname = std::string(ICONSDIR_VAR) + "/" + filename + ".png";
-		if (access(newname.c_str(), F_OK))
-			newname = iconBasePath + "/" + filename + ".png";
-		if (filename.find("/", 0) != std::string::npos)
-			newname = filename;
+		std::string newname = getIconPath(filename);
 		//printf("CFrameBuffer::paintIcon: check for %s\n", newname.c_str());fflush(stdout);
 
 		data = g_PicViewer->getIcon(newname, &width, &height);
@@ -1133,9 +1141,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
 			goto _display;
 		}
 
-		newname = std::string(ICONSDIR_VAR) + "/" + filename + ".raw";
-		if (access(newname.c_str(), F_OK))
-			newname = iconBasePath + "/" + filename + ".raw";
+		newname = getIconPath(filename, "raw");
 
 		int lfd = open(newname.c_str(), O_RDONLY);
 
diff --git a/src/driver/framebuffer.h b/src/driver/framebuffer.h
index 6ee46df62..9ed2ca839 100644
--- a/src/driver/framebuffer.h
+++ b/src/driver/framebuffer.h
@@ -226,6 +226,7 @@ class CFrameBuffer : public sigc::trackable
 
 		void setIconBasePath(const std::string & iconPath);
 		std::string getIconBasePath(){return iconBasePath;};
+		std::string getIconPath(std::string icon_name, std::string file_type = "png");
 
 		void getIconSize(const char * const filename, int* width, int *height);
 		/* h is the height of the target "window", if != 0 the icon gets centered in that window */