diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp
index d242b8491..7c36dad50 100644
--- a/src/driver/lcd4l.cpp
+++ b/src/driver/lcd4l.cpp
@@ -120,7 +120,7 @@ static void lcd4linux(bool run)
 
 	if (run == true)
 	{
-		if (g_settings.lcd4l_dpf_type == 3)
+		if (g_settings.lcd4l_dpf_type == CLCD4l::PNG)
 		{
 			if (my_system(3, lcd4linux.c_str(), "-o", PNGFILE) != 0)
 				printf("[CLCD4l] %s: executing '%s -o %s' failed\n", __FUNCTION__, lcd4linux.c_str(), PNGFILE);
@@ -1045,7 +1045,7 @@ bool CLCD4l::WriteFile(const char *file, std::string content, bool convert)
 		strReplace(content, "Ź", "\x5a\0");
 		strReplace(content, "ż", "\x7a\0");
 
-		if (g_settings.lcd4l_dpf_type == 0) strReplace(content, "ß", "\xe2\0");
+		if (g_settings.lcd4l_dpf_type == PEARL) strReplace(content, "ß", "\xe2\0");
 		strReplace(content, "é", "e");
 	}
 
diff --git a/src/driver/lcd4l.h b/src/driver/lcd4l.h
index 4c82d6f46..7c0f34554 100644
--- a/src/driver/lcd4l.h
+++ b/src/driver/lcd4l.h
@@ -43,7 +43,8 @@ class CLCD4l
 		{
 			PEARL		= 0,
 			SAMSUNG 	= 1,
-			VUSOLO4K	= 2
+			VUSOLO4K	= 2,
+			PNG			= 3
 		};
 
 		// Functions
diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp
index 860a5e48a..1c8968933 100644
--- a/src/gui/lcd4l_setup.cpp
+++ b/src/gui/lcd4l_setup.cpp
@@ -66,12 +66,12 @@ const CMenuOptionChooser::keyval LCD4L_SUPPORT_OPTIONS[] =
 
 const CMenuOptionChooser::keyval_ext LCD4L_DPF_TYPE_OPTIONS[] =
 {
-	{ 0, NONEXISTANT_LOCALE, "Pearl"},
-	{ 1, NONEXISTANT_LOCALE, "Samsung"},
+	{ CLCD4l::PEARL,	NONEXISTANT_LOCALE, "Pearl"},
+	{ CLCD4l::SAMSUNG,	NONEXISTANT_LOCALE, "Samsung"},
 #if defined BOXMODEL_VUSOLO4K
-	{ 2, NONEXISTANT_LOCALE, "VUSolo4K"},
+	{ CLCD4l::VUSOLO4K,	NONEXISTANT_LOCALE, "VUSolo4K"},
 #endif
-	{ 3, NONEXISTANT_LOCALE, "PNG"}
+	{ CLCD4l::PNG,		NONEXISTANT_LOCALE, "PNG"}
 };
 #define LCD4L_DPF_TYPE_OPTION_COUNT (sizeof(LCD4L_DPF_TYPE_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext))