diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index f9cf776d5..4eeb1d5ca 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -935,15 +935,15 @@
     <Content Include="apps\ui-tests-app\bindings\xmlbasics.xml" />
     <Content Include="apps\ui-tests-app\dialogs\dialogs.xml" />
     <Content Include="apps\ui-tests-app\image-view\gravatar.png" />
-    <Content Include="apps\ui-tests-app\image-view\rounded-images.css" />
-    <Content Include="apps\ui-tests-app\image-view\rounded-images.xml" />
+    <Content Include="apps\ui-tests-app\image-view\roundimg.css" />
+    <Content Include="apps\ui-tests-app\image-view\roundimg.xml" />
     <Content Include="apps\ui-tests-app\layouts\absolute.xml" />
     <Content Include="apps\ui-tests-app\layouts\dock.xml" />
     <Content Include="apps\ui-tests-app\layouts\grid.xml" />
     <Content Include="apps\ui-tests-app\layouts\stack.xml" />
     <Content Include="apps\ui-tests-app\layouts\wrap.xml" />
     <Content Include="apps\ui-tests-app\pages\background.xml" />
-    <Content Include="apps\ui-tests-app\pages\circle.xml" />
+    <Content Include="apps\ui-tests-app\image-view\roundbtn.xml" />
     <Content Include="apps\ui-tests-app\pages\handlers.xml" />
     <Content Include="apps\ui-tests-app\pages\htmlview.xml" />
     <Content Include="apps\ui-tests-app\pages\i86.xml" />
diff --git a/apps/ui-tests-app/image-view/roundbtn.xml b/apps/ui-tests-app/image-view/roundbtn.xml
new file mode 100644
index 000000000..eaf569e78
--- /dev/null
+++ b/apps/ui-tests-app/image-view/roundbtn.xml
@@ -0,0 +1,6 @@
+<Page>
+  <StackLayout>
+    <Button text="ButtonCircle" style="width:200;height:200;color:white;border-radius:100;border-width:2;border-color:red;background-color:blue" />
+    <Button text="ButtonImage"  style="width:200;height:200;color:white;border-radius:100;border-width:2;border-color:blue;background-image:url('~/pages/red.png')" />
+  </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/ui-tests-app/image-view/rounded-images.css b/apps/ui-tests-app/image-view/roundimg.css
similarity index 79%
rename from apps/ui-tests-app/image-view/rounded-images.css
rename to apps/ui-tests-app/image-view/roundimg.css
index 85f0a9c94..28ea1c642 100644
--- a/apps/ui-tests-app/image-view/rounded-images.css
+++ b/apps/ui-tests-app/image-view/roundimg.css
@@ -48,4 +48,14 @@
     border-radius: 30;
     border-width: 5;
     border-color: gray;
+}
+
+style {
+    width: 200;
+    height: 200;
+    color: white;
+    border-width: 2;
+    border-color: blue;
+    border-radius: 100;
+    background-image: url('~/pages/red.png');
 }
\ No newline at end of file
diff --git a/apps/ui-tests-app/image-view/rounded-images.xml b/apps/ui-tests-app/image-view/roundimg.xml
similarity index 100%
rename from apps/ui-tests-app/image-view/rounded-images.xml
rename to apps/ui-tests-app/image-view/roundimg.xml
diff --git a/apps/ui-tests-app/pages/circle.xml b/apps/ui-tests-app/pages/circle.xml
deleted file mode 100644
index d97b0392c..000000000
--- a/apps/ui-tests-app/pages/circle.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Page>
-  <StackLayout>
-    <Button text="ButtonCircle" id="btnCircle" style="width:200;height:200;color:white;border-width:2;border-color:red;border-radius:100;background-color:blue" />
-    <Button text="ButtonImage" id="btnImage" style="width:200;height:200;color:white;border-width:2;border-color:blue;border-radius:100;background-image:url('~/pages/red.png')" />
-  </StackLayout>
-</Page>
\ No newline at end of file