diff --git a/lib/awful/widget/tasklist.lua.in b/lib/awful/widget/tasklist.lua.in
index 66b69faac..90ee81360 100644
--- a/lib/awful/widget/tasklist.lua.in
+++ b/lib/awful/widget/tasklist.lua.in
@@ -34,19 +34,17 @@ local function tasklist_label(c, args)
     local bg_urgent = args.bg_urgent or theme.tasklist_bg_urgent or theme.bg_urgent
     local fg_minimize = args.fg_minimize or theme.tasklist_fg_minimize or theme.fg_minimize
     local bg_minimize = args.bg_minimize or theme.tasklist_bg_minimize or theme.bg_minimize
-    local floating_icon = args.floating_icon or theme.tasklist_floating_icon
     local font = args.font or theme.tasklist_font or theme.font or ""
     local bg = nil
     local text = "<span font_desc='"..font.."'>"
-    local name
-    local status_image
-    if client.floating.get(c) and floating_icon then
-        status_image = capi.image(floating_icon)
-    end
+    local name = ""
+    if client.floating.get(c) then name = name .. "✈" end
+    if c.maximized_horizontal then name = name .. '⬌' end
+    if c.maximized_vertical then name = name .. "⬍" end
     if c.minimized then
-        name = util.escape(c.icon_name) or util.escape(c.name) or util.escape("<untitled>")
+        name = name .. util.escape(c.icon_name) or util.escape(c.name) or util.escape("<untitled>")
     else
-        name = util.escape(c.name) or util.escape("<untitled>")
+        name = name .. util.escape(c.name) or util.escape("<untitled>")
     end
     if capi.client.focus == c then
         bg = bg_focus
@@ -65,7 +63,7 @@ local function tasklist_label(c, args)
         text = text .. name
     end
     text = text .. "</span>"
-    return text, bg, status_image, c.icon
+    return text, bg, nil, c.icon
 end
 
 local function tasklist_update(s, w, buttons, filter, data, style, template)
diff --git a/themes/default/tasklist/floating.png b/themes/default/tasklist/floating.png
deleted file mode 100644
index f29e7f5a9..000000000
Binary files a/themes/default/tasklist/floating.png and /dev/null differ
diff --git a/themes/default/tasklist/floatingw.png b/themes/default/tasklist/floatingw.png
deleted file mode 100644
index eb802aeeb..000000000
Binary files a/themes/default/tasklist/floatingw.png and /dev/null differ
diff --git a/themes/default/theme.lua.in b/themes/default/theme.lua.in
index 0e8cf7519..05ad43cda 100644
--- a/themes/default/theme.lua.in
+++ b/themes/default/theme.lua.in
@@ -35,8 +35,6 @@ theme.border_marked = "#91231c"
 theme.taglist_squares_sel   = "@AWESOME_THEMES_PATH@/default/taglist/squarefw.png"
 theme.taglist_squares_unsel = "@AWESOME_THEMES_PATH@/default/taglist/squarew.png"
 
-theme.tasklist_floating_icon = "@AWESOME_THEMES_PATH@/default/tasklist/floatingw.png"
-
 -- Variables set for theming the menu:
 -- menu_[bg|fg]_[normal|focus]
 -- menu_[border_color|border_width]
diff --git a/themes/sky/theme.lua.in b/themes/sky/theme.lua.in
index aa16cdbec..01713d61c 100644
--- a/themes/sky/theme.lua.in
+++ b/themes/sky/theme.lua.in
@@ -36,7 +36,6 @@ theme.layout_tile            = "@AWESOME_THEMES_PATH@/sky/layouts/tile.png"
 theme.layout_tiletop         = "@AWESOME_THEMES_PATH@/sky/layouts/tiletop.png"
 
 theme.awesome_icon           = "@AWESOME_THEMES_PATH@/sky/awesome-icon.png"
-theme.tasklist_floating_icon = "@AWESOME_THEMES_PATH@/sky/layouts/floating.png"
 
 -- from default for now...
 theme.menu_submenu_icon     = "@AWESOME_THEMES_PATH@/default/submenu.png"
diff --git a/themes/zenburn/theme.lua.in b/themes/zenburn/theme.lua.in
index d1287f4d5..0ee2ce20f 100644
--- a/themes/zenburn/theme.lua.in
+++ b/themes/zenburn/theme.lua.in
@@ -79,7 +79,6 @@ theme.taglist_squares_unsel = "@AWESOME_THEMES_PATH@/zenburn/taglist/squarez.png
 -- {{{ Misc
 theme.awesome_icon           = "@AWESOME_THEMES_PATH@/zenburn/awesome-icon.png"
 theme.menu_submenu_icon      = "@AWESOME_THEMES_PATH@/default/submenu.png"
-theme.tasklist_floating_icon = "@AWESOME_THEMES_PATH@/default/tasklist/floatingw.png"
 -- }}}
 
 -- {{{ Layout