diff --git a/app/boards/arm/corneish_zen/CMakeLists.txt b/app/boards/arm/corneish_zen/CMakeLists.txt
index 6882a971..d28ed277 100644
--- a/app/boards/arm/corneish_zen/CMakeLists.txt
+++ b/app/boards/arm/corneish_zen/CMakeLists.txt
@@ -12,35 +12,45 @@ zephyr_library()
 
 # zephyr_library_sources(corne-ish_zen.c)
 if(CONFIG_ZMK_DISPLAY)
-  zephyr_library_sources(widgets/icons/batt_100.c)
-  zephyr_library_sources(widgets/icons/batt_100_chg.c)
-  zephyr_library_sources(widgets/icons/batt_75.c)
-  zephyr_library_sources(widgets/icons/batt_75_chg.c)
-  zephyr_library_sources(widgets/icons/batt_50.c)
-  zephyr_library_sources(widgets/icons/batt_50_chg.c)
-  zephyr_library_sources(widgets/icons/batt_25.c)
-  zephyr_library_sources(widgets/icons/batt_25_chg.c)
-  zephyr_library_sources(widgets/icons/batt_5.c)
-  zephyr_library_sources(widgets/icons/batt_5_chg.c)
-  zephyr_library_sources(widgets/icons/batt_0.c)
-  zephyr_library_sources(widgets/icons/batt_0_chg.c)
-  zephyr_library_sources(widgets/icons/zenlogo.c)
-  zephyr_library_sources(widgets/icons/bluetooth_advertising.c)
-  zephyr_library_sources(widgets/icons/bluetooth_connected_right.c)
-  zephyr_library_sources(widgets/icons/bluetooth_disconnected_right.c)
-  zephyr_library_sources(widgets/icons/USB_connected.c)
-  zephyr_library_sources(widgets/icons/layers.c)
-  zephyr_library_sources(widgets/icons/layers2.c)
-  zephyr_library_sources(widgets/icons/bluetooth_connected_1.c)
-  zephyr_library_sources(widgets/icons/bluetooth_connected_2.c)
-  zephyr_library_sources(widgets/icons/bluetooth_connected_3.c)
-  zephyr_library_sources(widgets/icons/bluetooth_connected_4.c)
-  zephyr_library_sources(widgets/icons/bluetooth_connected_5.c)
-  zephyr_library_sources(widgets/icons/bluetooth_advertising_1.c)
-  zephyr_library_sources(widgets/icons/bluetooth_advertising_2.c)
-  zephyr_library_sources(widgets/icons/bluetooth_advertising_3.c)
-  zephyr_library_sources(widgets/icons/bluetooth_advertising_4.c)
-  zephyr_library_sources(widgets/icons/bluetooth_advertising_5.c)
+  if(CONFIG_CUSTOM_WIDGET_BATTERY_STATUS)
+    zephyr_library_sources(widgets/icons/batt_100.c)
+    zephyr_library_sources(widgets/icons/batt_100_chg.c)
+    zephyr_library_sources(widgets/icons/batt_75.c)
+    zephyr_library_sources(widgets/icons/batt_75_chg.c)
+    zephyr_library_sources(widgets/icons/batt_50.c)
+    zephyr_library_sources(widgets/icons/batt_50_chg.c)
+    zephyr_library_sources(widgets/icons/batt_25.c)
+    zephyr_library_sources(widgets/icons/batt_25_chg.c)
+    zephyr_library_sources(widgets/icons/batt_5.c)
+    zephyr_library_sources(widgets/icons/batt_5_chg.c)
+    zephyr_library_sources(widgets/icons/batt_0.c)
+    zephyr_library_sources(widgets/icons/batt_0_chg.c)
+  endif()
+  if(CONFIG_CUSTOM_WIDGET_PERIPHERAL_STATUS)
+    zephyr_library_sources(widgets/icons/bluetooth_advertising.c)
+    zephyr_library_sources(widgets/icons/bluetooth_connected_right.c)
+    zephyr_library_sources(widgets/icons/bluetooth_disconnected_right.c)
+  endif()
+  if(CONFIG_CUSTOM_WIDGET_OUTPUT_STATUS)
+    zephyr_library_sources(widgets/icons/USB_connected.c)
+    zephyr_library_sources(widgets/icons/bluetooth_connected_1.c)
+    zephyr_library_sources(widgets/icons/bluetooth_connected_2.c)
+    zephyr_library_sources(widgets/icons/bluetooth_connected_3.c)
+    zephyr_library_sources(widgets/icons/bluetooth_connected_4.c)
+    zephyr_library_sources(widgets/icons/bluetooth_connected_5.c)
+    zephyr_library_sources(widgets/icons/bluetooth_advertising_1.c)
+    zephyr_library_sources(widgets/icons/bluetooth_advertising_2.c)
+    zephyr_library_sources(widgets/icons/bluetooth_advertising_3.c)
+    zephyr_library_sources(widgets/icons/bluetooth_advertising_4.c)
+    zephyr_library_sources(widgets/icons/bluetooth_advertising_5.c)
+  endif()
+  if(CONFIG_CUSTOM_WIDGET_LAYER_STATUS)
+    zephyr_library_sources(widgets/icons/layers.c)
+    zephyr_library_sources(widgets/icons/layers2.c)
+  endif()
+  if(CONFIG_BOARD_CORNEISH_ZEN_V2_RIGHT)
+    zephyr_library_sources(widgets/icons/zenlogo.c)
+  endif()
 endif()
 
 zephyr_library_include_directories(${ZEPHYR_LVGL_MODULE_DIR})