diff --git a/src/dock.c b/src/dock.c
index 9d74b490..96d8c61d 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -1080,22 +1080,16 @@ WDock *wDockCreate(WScreen * scr, int type)
 {
 	WDock *dock;
 	WAppIcon *btn;
-	int icon_count;
 
 	make_keys();
 
 	dock = wmalloc(sizeof(WDock));
 	memset(dock, 0, sizeof(WDock));
 
-	if (type == WM_CLIP)
-		icon_count = CLIP_MAX_ICONS;
-	else
-		icon_count = scr->scr_height / wPreferences.icon_size;
+	dock->max_icons = DOCK_MAX_ICONS;
 
-	dock->icon_array = wmalloc(sizeof(WAppIcon *) * icon_count);
-	memset(dock->icon_array, 0, sizeof(WAppIcon *) * icon_count);
-
-	dock->max_icons = icon_count;
+	dock->icon_array = wmalloc(sizeof(WAppIcon *) * dock->max_icons);
+	memset(dock->icon_array, 0, sizeof(WAppIcon *) * dock->max_icons);
 
 	btn = mainIconCreate(scr, type);
 
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 5008ac65..5b70e537 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -325,8 +325,8 @@
  * Set this to zero if you want instant raise. */
 #define AUTO_RAISE_DELAY        600
 
-/* Max. number of icons the clip can have */
-#define CLIP_MAX_ICONS		32
+/* Max. number of icons the dock and clip can have */
+#define DOCK_MAX_ICONS		32
 
 /* blink interval when invoking a menu item */
 #define MENU_BLINK_DELAY	60000