diff --git a/Dockerfile b/Dockerfile
index 8ffce2e..1d152fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN curl -O https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
 RUN echo '444e22ce8ca0f67353bda4b85175ed3731cae3ffa695ca18119cbacef1c1bea0  sdk-tools-linux-3859397.zip' | sha256sum -c
 RUN unzip sdk-tools-linux-3859397.zip
 RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager --update
-RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-30'
+RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-31'
 RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'extras;android;m2repository'
 RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'ndk;20.0.5594570'
 RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'platform-tools'
diff --git a/cmd/tailscale/ui.go b/cmd/tailscale/ui.go
index 5a7849e..5633ae3 100644
--- a/cmd/tailscale/ui.go
+++ b/cmd/tailscale/ui.go
@@ -520,7 +520,7 @@ type Dismiss struct {
 }
 
 func (d *Dismiss) Add(gtx layout.Context, color color.NRGBA) {
-	defer pointer.Rect(image.Rectangle{Max: gtx.Constraints.Min}).Push(gtx.Ops).Pop()
+	defer clip.Rect(image.Rectangle{Max: gtx.Constraints.Min}).Push(gtx.Ops).Pop()
 	pointer.InputOp{Tag: d, Types: pointer.Press}.Add(gtx.Ops)
 	paint.Fill(gtx.Ops, color)
 }
@@ -787,9 +787,8 @@ func (ui *UI) layoutShareDialog(gtx layout.Context, sysIns system.Insets) {
 						})
 						// Swallow clicks to title.
 						var c widget.Clickable
-						gtx.Constraints.Min = d.Size
-						c.Layout(gtx)
-						return d
+						gtx.Queue = nil
+						return c.Layout(gtx, func(gtx C) D { return d })
 					}),
 					layout.Rigid(func(gtx C) D {
 						if d.loaded {
@@ -1145,7 +1144,7 @@ func (ui *UI) layoutTop(gtx layout.Context, sysIns system.Insets, state *Backend
 						if state.State <= ipn.NeedsLogin {
 							return D{}
 						}
-						sw := material.Switch(ui.theme, &ui.enabled)
+						sw := material.Switch(ui.theme, &ui.enabled, "Enable VPN")
 						sw.Color.Enabled = rgb(white)
 						if state.State < ipn.Stopped {
 							sw.Color.Enabled = rgb(0xbbbbbb)
@@ -1167,7 +1166,7 @@ func (ui *UI) layoutTop(gtx layout.Context, sysIns system.Insets, state *Backend
 					if state.State <= ipn.NeedsLogin {
 						return D{}
 					}
-					btn := material.IconButton(ui.theme, &ui.menu.open, ui.icons.more)
+					btn := material.IconButton(ui.theme, &ui.menu.open, ui.icons.more, "Open menu")
 					btn.Color = rgb(white)
 					btn.Background = color.NRGBA{}
 					return btn.Layout(gtx)
diff --git a/go.mod b/go.mod
index cbbcc38..f06e18d 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	eliasnaur.com/font v0.0.0-20200617114307-e02d32decb4b
-	gioui.org v0.0.0-20211016064351-4d22a926a9dd
+	gioui.org v0.0.0-20220228171706-79bfd3adbd32
 	gioui.org/cmd v0.0.0-20210925100615-41f3a7e74ee6
 	golang.org/x/exp v0.0.0-20210722180016-6781d3edade3
 	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
@@ -15,7 +15,7 @@ require (
 
 require (
 	gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 // indirect
-	gioui.org/shader v1.0.4 // indirect
+	gioui.org/shader v1.0.6 // indirect
 	github.com/akavel/rsrc v0.10.1 // indirect
 	github.com/akutz/memconn v0.1.0 // indirect
 	github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
diff --git a/go.sum b/go.sum
index bc2f138..6f64470 100644
--- a/go.sum
+++ b/go.sum
@@ -5,16 +5,16 @@ eliasnaur.com/font v0.0.0-20200617114307-e02d32decb4b h1:J9r7EuPdhvBTafg34EqrObA
 eliasnaur.com/font v0.0.0-20200617114307-e02d32decb4b/go.mod h1:CYwJpIhpzVfoHpFXGlXjSx9mXMWtHt4XXmZb6RjumRc=
 filippo.io/mkcert v1.4.3 h1:axpnmtrZMM8u5Hf4N3UXxboGemMOV+Tn+e+pkHM6E3o=
 gioui.org v0.0.0-20210910062418-d5d0a75a9bcb/go.mod h1:BTldRXnY5mrUrYZCdWyDwyMzyUzpfZN1cF4MMRrOt9w=
-gioui.org v0.0.0-20211016064351-4d22a926a9dd h1:G5Rkf+VCEvFprJxe7E25N+40hCAI4fMv3iR7l2PekmE=
-gioui.org v0.0.0-20211016064351-4d22a926a9dd/go.mod h1:vJAHQwoR+DMYs8X5RpdWAgkpnw31wFSofF1hHHcZ6gs=
+gioui.org v0.0.0-20220228171706-79bfd3adbd32 h1:8T1Yerfc7OBhR/TVJZciub1cjSNPrqLAt8rPRXJPvcc=
+gioui.org v0.0.0-20220228171706-79bfd3adbd32/go.mod h1:yoWOxPng6WkDpsud+NRmkoftmyWn3rkKsYGEcWHpjTI=
 gioui.org/cmd v0.0.0-20210925100615-41f3a7e74ee6 h1:SkAdohDhTUjl+ZtM417Xeu+uFd7SQubwR9uAyqJqC8c=
 gioui.org/cmd v0.0.0-20210925100615-41f3a7e74ee6/go.mod h1:qrH3h4nt/PyIqx/XabL/eJ5cXQnQ0ERHqC3VEXx/Rmg=
 gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
 gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 h1:AGDDxsJE1RpcXTAxPG2B4jrwVUJGFDjINIPi1jtO6pc=
 gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
 gioui.org/shader v1.0.2/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
-gioui.org/shader v1.0.4 h1:taS5l4MYdnKOQ5cRh1FPUaOp0YAs0qkRrhwbZqHSYrQ=
-gioui.org/shader v1.0.4/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
+gioui.org/shader v1.0.6 h1:cvZmU+eODFR2545X+/8XucgZdTtEjR3QWW6W65b0q5Y=
+gioui.org/shader v1.0.6/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=