diff --git a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/view/FullImageScreen.kt b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/view/FullImageScreen.kt
index 7121afb19f..d3d42714d9 100755
--- a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/view/FullImageScreen.kt
+++ b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/view/FullImageScreen.kt
@@ -41,7 +41,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.RowScope.align
 import androidx.compose.material.Surface
 import androidx.compose.ui.unit.dp
 import example.imageviewer.core.FilterType
@@ -88,7 +87,7 @@ private fun setLoadingScreen() {
 
     Stack {
         Surface(color = MiniatureColor, modifier = Modifier.preferredHeight(44.dp)) {}
-        Box(modifier = Modifier.align(Alignment.Center)) {
+        Box() {
             Surface(color = DarkGray, elevation = 4.dp, shape = CircleShape) {
                 CircularProgressIndicator(
                     modifier = Modifier.preferredSize(50.dp).padding(3.dp, 3.dp, 4.dp, 4.dp),
diff --git a/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/FullImageScreen.kt b/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/FullImageScreen.kt
index 48ddb63670..c3d6adddbb 100755
--- a/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/FullImageScreen.kt
+++ b/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/FullImageScreen.kt
@@ -40,7 +40,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.RowScope.align
 import androidx.compose.material.Surface
 import androidx.compose.ui.unit.dp
 import example.imageviewer.core.FilterType
@@ -163,7 +162,6 @@ fun FilterButton(
 ) {
     Surface(
         color = Transparent,
-        modifier = Modifier.align(Alignment.CenterVertically),
         shape = CircleShape
     ) {
         Clickable(
diff --git a/examples/imageviewer/settings.gradle.kts b/examples/imageviewer/settings.gradle.kts
index bb47f08e85..e8c10e1740 100755
--- a/examples/imageviewer/settings.gradle.kts
+++ b/examples/imageviewer/settings.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-unmerged30")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-build58")
         classpath("com.android.tools.build:gradle:4.0.1")
         classpath(kotlin("gradle-plugin", version = "1.4.0"))
     }
diff --git a/examples/issues/settings.gradle.kts b/examples/issues/settings.gradle.kts
index bb47f08e85..e8c10e1740 100644
--- a/examples/issues/settings.gradle.kts
+++ b/examples/issues/settings.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-unmerged30")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-build58")
         classpath("com.android.tools.build:gradle:4.0.1")
         classpath(kotlin("gradle-plugin", version = "1.4.0"))
     }