diff --git a/src/driver/glcd/analogclock.cpp b/src/driver/glcd/analogclock.cpp
index f53ed4558..c08922f75 100644
--- a/src/driver/glcd/analogclock.cpp
+++ b/src/driver/glcd/analogclock.cpp
@@ -38,28 +38,29 @@ enum files
 	ANALOG_MIN = 2
 };
 
-const char * const file_name[LCD_NUMBER_OF_FILES] =
+const char * const file_name[] =
 {
 	"analog_clock",
 	"analog_hour",
 	"analog_min"
 };
+#define LCD_NUMBER_OF_FILES (sizeof(file_name)/sizeof(file_name[0]))
 
-#define NUMBER_OF_PATHS 2
-const char * const file_path[NUMBER_OF_PATHS] =
+const char * const file_path[] =
 {
-	LCDDIR_VAR "/oled/clock/",
-	DATADIR "/oled/clock/"
+	ICONSDIR "/oled/clock/",
+	ICONSDIR_VAR "/oled/clock/"
 };
+#define NUMBER_OF_PATHS (sizeof(file_path)/sizeof(file_path[0]))
 
 static std::string file[LCD_NUMBER_OF_FILES] = {""};
 
 void InitAnalogClock(void)
 {
-	for (int i = 0; i < LCD_NUMBER_OF_FILES; i++)
+	for (unsigned int i = 0; i < LCD_NUMBER_OF_FILES; i++)
 	{
 		std::string tmp_file;
-		for (int j = 0; j < NUMBER_OF_PATHS; j++)
+		for (unsigned int j = 0; j < NUMBER_OF_PATHS; j++)
 		{
 			std::string file_jpg = file_path[j];
 			file_jpg += file_name[i];
diff --git a/src/driver/glcd/analogclock.h b/src/driver/glcd/analogclock.h
index 27eceee6a..ce2710120 100644
--- a/src/driver/glcd/analogclock.h
+++ b/src/driver/glcd/analogclock.h
@@ -25,10 +25,6 @@
 
 #include "glcd.h"
 
-#define LCDDIR_VAR "/usr/share/tuxbox/neutrino/icons"
-
-#define LCD_NUMBER_OF_FILES 3
-
 void InitAnalogClock();
 void RenderClock(int x, int y);
 void RenderHands(int hour, int min, int sec, int posx, int posy, int hour_size, int min_size, int sec_size);
diff --git a/src/driver/glcd/digitalclock.cpp b/src/driver/glcd/digitalclock.cpp
index c8b29d16d..527d8251e 100644
--- a/src/driver/glcd/digitalclock.cpp
+++ b/src/driver/glcd/digitalclock.cpp
@@ -47,7 +47,7 @@ enum digits
 	TIME_DOTS = 10
 };
 
-const char * const digit_name[LCD_NUMBER_OF_DIGITS] =
+const char * const digit_name[] =
 {
 	"time_zero",
         "time_one",
@@ -61,22 +61,23 @@ const char * const digit_name[LCD_NUMBER_OF_DIGITS] =
 	"time_nine",
 	"time_dots"
 };
+#define LCD_NUMBER_OF_DIGITS (sizeof(digit_name)/sizeof(digit_name[0]))
 
-#define NUMBER_OF_PATHS 2
-const char * const digit_path[NUMBER_OF_PATHS] =
+const char * const digit_path[] =
 {
-        LCDDIR_VAR "/oled/clock/",
-        DATADIR "/oled/clock/"
+	ICONSDIR "/oled/clock/",
+	ICONSDIR_VAR "/oled/clock/"
 };
+#define NUMBER_OF_PATHS (sizeof(digit_path)/sizeof(digit_path[0]))
 
 static std::string digit[LCD_NUMBER_OF_DIGITS] = {""};
 
 void InitDigitalClock(void)
 {
-	for (int i = 0; i < LCD_NUMBER_OF_DIGITS; i++)
+	for (unsigned int i = 0; i < LCD_NUMBER_OF_DIGITS; i++)
 	{
 		std::string digit_file;
-		for (int j = 0; j < NUMBER_OF_PATHS; j++)
+		for (unsigned int j = 0; j < NUMBER_OF_PATHS; j++)
 		{
 			std::string file_jpg = digit_path[j];
 			file_jpg += digit_name[i];
diff --git a/src/driver/glcd/digitalclock.h b/src/driver/glcd/digitalclock.h
index fe1116bac..0e2a8dab1 100644
--- a/src/driver/glcd/digitalclock.h
+++ b/src/driver/glcd/digitalclock.h
@@ -28,10 +28,6 @@
 #pragma GCC diagnostic warning "-Wunused-parameter"
 #include "glcd.h"
 
-#define LCDDIR_VAR "/usr/share/tuxbox/neutrino/icons"
-
-#define LCD_NUMBER_OF_DIGITS 11
-
 void InitDigitalClock();
 void RenderTimeDigit(int _digit, int x, int y);
 void RenderDots(int x, int y);
diff --git a/src/driver/glcd/weather.cpp b/src/driver/glcd/weather.cpp
index 3b40a87aa..4b4ea0ce8 100644
--- a/src/driver/glcd/weather.cpp
+++ b/src/driver/glcd/weather.cpp
@@ -42,7 +42,7 @@ enum weathers
 	//WEATHER_UNKNOWN = 10
 };
 
-const char * const weather_name[LCD_NUMBER_OF_WEATHERS] =
+const char * const weather_name[] =
 {
 	"clear-day",
         "clear-night",
@@ -56,13 +56,14 @@ const char * const weather_name[LCD_NUMBER_OF_WEATHERS] =
 	"wind",
 	//"unknown"
 };
+#define LCD_NUMBER_OF_WEATHERS (sizeof(weather_name)/sizeof(weather_name[0]))
 
-#define NUMBER_OF_PATHS 2
-const char * const weather_path[NUMBER_OF_PATHS] =
+const char * const weather_path[] =
 {
-        LCDDIR_VAR "/oled/weather/",
-        DATADIR "/oled/weather/"
+	ICONSDIR "/oled/weather/",
+	ICONSDIR_VAR "/oled/weather/"
 };
+#define NUMBER_OF_PATHS (sizeof(weather_path)/sizeof(weather_path[0]))
 
 static bool ForceUpdate = true;
 static bool fonts_initialized = false;
@@ -85,10 +86,10 @@ static std::string st_next_wicon = "";
 
 void InitWeather(void)
 {
-	for (int i = 0; i < LCD_NUMBER_OF_WEATHERS; i++)
+	for (unsigned int i = 0; i < LCD_NUMBER_OF_WEATHERS; i++)
 	{
 		std::string weather_file;
-		for (int j = 0; j < NUMBER_OF_PATHS; j++)
+		for (unsigned int j = 0; j < NUMBER_OF_PATHS; j++)
 		{
 			std::string file_jpg = weather_path[j];
 			file_jpg += weather_name[i];
diff --git a/src/driver/glcd/weather.h b/src/driver/glcd/weather.h
index c1860f487..156912d8e 100644
--- a/src/driver/glcd/weather.h
+++ b/src/driver/glcd/weather.h
@@ -28,10 +28,6 @@
 #pragma GCC diagnostic warning "-Wunused-parameter"
 #include "glcd.h"
 
-#define LCDDIR_VAR "/usr/share/tuxbox/neutrino/icons"
-
-#define LCD_NUMBER_OF_WEATHERS 10
-
 void InitWeather();
 void WeatherUpdateFonts();
 int WeatherNameToNumber(std::string name);