diff --git a/src/modules/Makefile_tiling.mk b/src/modules/Makefile_tiling.mk
index ce3617917..932b75cd2 100644
--- a/src/modules/Makefile_tiling.mk
+++ b/src/modules/Makefile_tiling.mk
@@ -1,23 +1,13 @@
 EXTRA_DIST += src/modules/tiling/module.desktop.in \
-src/modules/tiling/e-module-tiling.edc \
-src/modules/tiling/images/icon_floating.png \
-src/modules/tiling/images/icon_horizontal.png \
-src/modules/tiling/images/icon_vertical.png \
-src/modules/tiling/images/module_icon.png
+src/modules/tiling/e-module-tiling.edj
 if USE_MODULE_TILING
 tilingdir = $(MDIR)/tiling
 tiling_DATA = src/modules/tiling/e-module-tiling.edj \
 	      src/modules/tiling/module.desktop
-CLEANFILES += src/modules/tiling/e-module-tiling.edj
 
 tilingpkgdir = $(MDIR)/tiling/$(MODULE_ARCH)
 tilingpkg_LTLIBRARIES = src/modules/tiling/module.la
 
-TILING_EDJE_FLAGS = $(EDJE_FLAGS) -id $(top_srcdir)/src/modules/tiling/images
-
-src/modules/tiling/%.edj: src/modules/tiling/%.edc Makefile
-	$(EDJE_CC) $(TILING_EDJE_FLAGS) $< $@
-
 src_modules_tiling_module_la_LIBADD = $(MOD_LIBS)
 src_modules_tiling_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_tiling_module_la_LDFLAGS = $(MOD_LDFLAGS)
diff --git a/src/modules/tiling/.gitignore b/src/modules/tiling/.gitignore
deleted file mode 100644
index d6ceca657..000000000
--- a/src/modules/tiling/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-e-module-tiling.edj
diff --git a/src/modules/tiling/e-module-tiling.edc b/src/modules/tiling/e-module-tiling.edc
deleted file mode 100644
index f44c69ea4..000000000
--- a/src/modules/tiling/e-module-tiling.edc
+++ /dev/null
@@ -1,71 +0,0 @@
-images {
-   image: "module_icon.png" COMP;
-
-   image: "icon_vertical.png" COMP;
-   image: "icon_horizontal.png" COMP;
-   image: "icon_floating.png" COMP;
-}
-collections {
-    group {
-        name: "icon";
-        parts {
-            part {
-                name: "image";
-                mouse_events: 0;
-                description {
-                    state: "default" 0.0;
-                    aspect: 1.0 1.0;
-                    aspect_preference: BOTH;
-                    image.normal: "module_icon.png";
-                }
-            }
-        }
-    }
-    group {
-        name: "modules/tiling/main";
-        parts {
-            part {
-                name: "image";
-                description {
-                    state: "default" 0.0;
-                    aspect: 1.0 1.0;
-                    aspect_preference: BOTH;
-                    image.normal: "icon_horizontal.png";
-                }
-                description {
-                    state: "vertical" 0.0;
-                    inherit: "default" 0.0;
-                    image.normal: "icon_vertical.png";
-                }
-                description {
-                    state: "floating" 0.0;
-                    inherit: "default" 0.0;
-                    image.normal: "icon_floating.png";
-                }
-            }
-        }
-        programs {
-            program {
-                name: "to_horizontal";
-                signal: "tiling,mode,horizontal";
-                source: "e";
-                action: STATE_SET "default" 0.0;
-                target: "image";
-            }
-            program {
-                name: "to_vertical";
-                signal: "tiling,mode,vertical";
-                source: "e";
-                action: STATE_SET "vertical" 0.0;
-                target: "image";
-            }
-            program {
-                name: "to_floating";
-                signal: "tiling,mode,floating";
-                source: "e";
-                action: STATE_SET "floating" 0.0;
-                target: "image";
-            }
-        }
-    }
-}
diff --git a/src/modules/tiling/e-module-tiling.edj b/src/modules/tiling/e-module-tiling.edj
new file mode 100644
index 000000000..ae6f2553e
Binary files /dev/null and b/src/modules/tiling/e-module-tiling.edj differ
diff --git a/src/modules/tiling/images/icon_floating.png b/src/modules/tiling/images/icon_floating.png
deleted file mode 100644
index 1bde81898..000000000
Binary files a/src/modules/tiling/images/icon_floating.png and /dev/null differ
diff --git a/src/modules/tiling/images/icon_horizontal.png b/src/modules/tiling/images/icon_horizontal.png
deleted file mode 100644
index a8a906240..000000000
Binary files a/src/modules/tiling/images/icon_horizontal.png and /dev/null differ
diff --git a/src/modules/tiling/images/icon_vertical.png b/src/modules/tiling/images/icon_vertical.png
deleted file mode 100644
index 80a2e9bd1..000000000
Binary files a/src/modules/tiling/images/icon_vertical.png and /dev/null differ
diff --git a/src/modules/tiling/images/module_icon.png b/src/modules/tiling/images/module_icon.png
deleted file mode 100644
index 328acc9ad..000000000
Binary files a/src/modules/tiling/images/module_icon.png and /dev/null differ