diff --git a/icons/layouts/dwindle.png b/icons/layouts/dwindle.png
new file mode 100644
index 0000000..d4dc91e
Binary files /dev/null and b/icons/layouts/dwindle.png differ
diff --git a/icons/layouts/fairh.png b/icons/layouts/fairh.png
new file mode 100644
index 0000000..298db85
Binary files /dev/null and b/icons/layouts/fairh.png differ
diff --git a/icons/layouts/fairv.png b/icons/layouts/fairv.png
new file mode 100644
index 0000000..01ffeb6
Binary files /dev/null and b/icons/layouts/fairv.png differ
diff --git a/icons/layouts/floating.png b/icons/layouts/floating.png
new file mode 100644
index 0000000..976716d
Binary files /dev/null and b/icons/layouts/floating.png differ
diff --git a/icons/layouts/fullscreen.png b/icons/layouts/fullscreen.png
new file mode 100644
index 0000000..96f39e4
Binary files /dev/null and b/icons/layouts/fullscreen.png differ
diff --git a/icons/layouts/magnifier.png b/icons/layouts/magnifier.png
new file mode 100644
index 0000000..6c2ef13
Binary files /dev/null and b/icons/layouts/magnifier.png differ
diff --git a/icons/layouts/max.png b/icons/layouts/max.png
new file mode 100644
index 0000000..12a0c51
Binary files /dev/null and b/icons/layouts/max.png differ
diff --git a/icons/layouts/spiral.png b/icons/layouts/spiral.png
new file mode 100644
index 0000000..718b6d7
Binary files /dev/null and b/icons/layouts/spiral.png differ
diff --git a/icons/layouts/tile.png b/icons/layouts/tile.png
new file mode 100644
index 0000000..39d72e6
Binary files /dev/null and b/icons/layouts/tile.png differ
diff --git a/icons/layouts/tilebottom.png b/icons/layouts/tilebottom.png
new file mode 100644
index 0000000..3ba697d
Binary files /dev/null and b/icons/layouts/tilebottom.png differ
diff --git a/icons/layouts/tileleft.png b/icons/layouts/tileleft.png
new file mode 100644
index 0000000..76e272e
Binary files /dev/null and b/icons/layouts/tileleft.png differ
diff --git a/icons/layouts/tiletop.png b/icons/layouts/tiletop.png
new file mode 100644
index 0000000..3127a1e
Binary files /dev/null and b/icons/layouts/tiletop.png differ
diff --git a/rc/theme.lua b/rc/theme.lua
index de5aa96..ac585a5 100644
--- a/rc/theme.lua
+++ b/rc/theme.lua
@@ -6,6 +6,13 @@ if theme then
    theme.wallpaper_cmd = { "/bin/true" }
    theme.font = "Terminus 8"
 
+   for n, l in pairs(theme) do
+      local layout = n:match("layout_([%w]+)")
+      if layout then
+	 theme[n] = awful.util.getdir("config") .. "/icons/layouts/" .. layout .. ".png"
+      end
+   end
+
    theme.border_width  = 4
    theme.border_normal = "#00000000"
    theme.border_focus  = "#FF7F0066"