diff --git a/0002-on.draw b/0002-on.draw
index ab12c3b..7fcbb12 100644
--- a/0002-on.draw
+++ b/0002-on.draw
@@ -1,5 +1,5 @@
 on.draw = function()
 	Global_state.button_handlers = {}
-	love.graphics.scale(2)
+--	love.graphics.scale(6)
 	draw_data()
 end
\ No newline at end of file
diff --git a/0003-draw_data b/0003-draw_data
index 1f7c9a6..2d7dbff 100644
--- a/0003-draw_data
+++ b/0003-draw_data
@@ -50,7 +50,6 @@ draw_data = function()
 				h=c,
 				color = {1,1,1, 0},
 				icon = function(params)
-if x ~= 1 or y ~= 1 then return end
 					make_button_pop(params)
 					if Data[t1][t2] then
 						local px = (params.w - App.width(Data[t1][t2])) / 2
@@ -79,4 +78,4 @@ if x ~= 1 or y ~= 1 then return end
 		App.color{r=0, g=0, b=0}
 		love.graphics.print(score(Data, t1), l+px, top+y*c+py)
 	end
-end
\ No newline at end of file
+end
diff --git a/0017-make_button_pop b/0017-make_button_pop
index f5aa256..2bdf406 100644
--- a/0017-make_button_pop
+++ b/0017-make_button_pop
@@ -1,21 +1,32 @@
 make_button_pop = function(params)
-	-- button shadow
-	App.color{r=0.6, g=0.6, b=0}
---	love.graphics.rectangle('fill', params.x+2, params.y+2, params.w-8, 6)
---	love.graphics.rectangle('fill', params.x+2, params.y+2, 6, params.h-8)
-	love.graphics.polygon('fill',
-		params.x+2, params.y+2,
-		params.x+2, params.y+params.h-4,
-		params.x+params.w-4, params.y+2)
-	-- button highlight
-	App.color{r=1, g=1, b=0}
---	love.graphics.rectangle('fill', params.x+params.w-6, params.y+6, 4, params.h-8)
---	love.graphics.rectangle('fill', params.x+6, params.y+params.h-6, params.w-8, 4)
-	love.graphics.polygon('fill',
-		params.x+params.w-4, params.y+params.h-4,
-		params.x+2, params.y+params.h-4,
-		params.x+params.w-4, params.y+2)
+	-- leave 1px on all sides for that border with linewidth 3
+	-- shadows/highlights 2px
+	local p = 4
 	-- button surface
 	App.color{r=0.8, g=0.8, b=0}
-	love.graphics.rectangle('fill', params.x+6, params.y+6, params.w-12, params.h-12)
+	love.graphics.rectangle('fill', params.x+p+1, params.y+p+1, params.w-(p+1)*2, params.h-(p+1)*2)
+	-- button shadow
+	App.color{r=0.6, g=0.6, b=0}
+	love.graphics.rectangle('fill', params.x+1, params.y+1, params.w-p-1-1, p)
+	love.graphics.rectangle('fill', params.x+1, params.y+1, p, params.h-p-1-1)
+	love.graphics.polygon('fill',
+		params.x+1, params.y+params.h-p-1,
+		params.x+p+1, params.y+params.h-p-1,
+		params.x+1, params.y+params.h-1)
+	love.graphics.polygon('fill',
+		params.x+params.w-1, params.y+1,
+		params.x+params.w-p-1, params.y+1,
+		params.x+params.w-p-1, params.y+p+1)
+	-- button highlight
+	App.color{r=1, g=1, b=0}
+	love.graphics.rectangle('fill', params.x+params.w-p-1, params.y+p+1, p, params.h-p-1-1)
+	love.graphics.rectangle('fill', params.x+p+1, params.y+params.h-p-1, params.w-p-1-1, p)
+	love.graphics.polygon('fill',
+		params.x+p+1, params.y+params.h-1,
+		params.x+p+1, params.y+params.h-p-1,
+		params.x+1, params.y+params.h-1)
+	love.graphics.polygon('fill',
+		params.x+params.w-1, params.y+1,
+		params.x+params.w-1, params.y+p+1,
+		params.x+params.w-p-1, params.y+p+1)
 end
\ No newline at end of file