diff --git a/core/tagger/tagger.lua b/core/tagger/tagger.lua
index 9dbb249..c580c26 100755
--- a/core/tagger/tagger.lua
+++ b/core/tagger/tagger.lua
@@ -46,12 +46,18 @@ end
 
 -- Return current column
 function Tagger:get_col()
-	return ( (self:get_tag() - 1) % self.cols ) + 1
+	return (
+		(self:get_tag() - 1) % self.cols
+	) + 1
 end
 
 -- Return current row
 function Tagger:get_row()
-	return math.floor( (self:get_tag() - self:get_col()) / self.cols ) + 1
+	return math.floor(
+		(
+			self:get_tag() - self:get_col()
+		) / self.cols
+	) + 1
 end
 
 -- Select a tag by position
diff --git a/core/tasklist.lua b/core/tasklist.lua
index 4a24635..4950243 100755
--- a/core/tasklist.lua
+++ b/core/tasklist.lua
@@ -58,9 +58,14 @@ tasklist.make = function(screen)
 			{
 				{
 					{
-						id = "clienticon",
-						widget = awful.widget.clienticon,
-						forced_width = config.core.clienticon_width
+						widget = wibox.container.place,
+						halign = "center",
+						valign = "bottom",
+						fill_vertical = true,
+						{
+							id = "clienticon",
+							widget = awful.widget.clienticon,
+						},
 					},
 					margins = beautiful.dpi(3),
 					widget = wibox.container.margin
@@ -79,7 +84,7 @@ tasklist.make = function(screen)
 
 				-- Change background when mouse is over widget
 				self:connect_signal("mouse::enter", function(result)
-					self:get_children_by_id("top_tab")[1].bg = "#2DA0DA"
+					--self:get_children_by_id("top_tab")[1].bg = "#2DA0DA"
 					self:get_children_by_id("background")[1].bg = beautiful.color.bar.hover_bg
 
 				end)
@@ -90,9 +95,9 @@ tasklist.make = function(screen)
 					if c == client.focus then
 						self:get_children_by_id("top_tab")[1].bg = "#2DA0FF"
 					elseif c.minimized then
-						self:get_children_by_id("top_tab")[1].bg = "#2DA0DA77"
-					else
 						self:get_children_by_id("top_tab")[1].bg = beautiful.color.bar.hover_bg --beautiful.color.transparent
+					else
+						self:get_children_by_id("top_tab")[1].bg = "#2DA0DA77"
 					end
 				end)
 			end,
@@ -107,9 +112,9 @@ tasklist.make = function(screen)
 				if c == client.focus then
 					self:get_children_by_id("top_tab")[1].bg = "#2DA0DA"
 				elseif c.minimized then
-					self:get_children_by_id("top_tab")[1].bg = "#2DA0DA77"
-				else
 					self:get_children_by_id("top_tab")[1].bg = beautiful.color.bar.hover_bg --beautiful.color.transparent
+				else
+					self:get_children_by_id("top_tab")[1].bg = "#2DA0DA77"
 				end
 			end,
 			layout = wibox.layout.align.vertical,