diff --git a/apps/app/ui-tests-app/list-view/images-template.ts b/apps/app/ui-tests-app/list-view/images-template.ts
index bfb06b252..8a29e6137 100644
--- a/apps/app/ui-tests-app/list-view/images-template.ts
+++ b/apps/app/ui-tests-app/list-view/images-template.ts
@@ -8,7 +8,7 @@ export function navigatingTo(args: EventData) {
 
 export class ImagesTemplateViewModel extends Observable {
 
-    public items: Array<string> = ["res://icon", null, "~/ui-tests-app/list-view/no-image.png", null, "~/ui-tests-app/list-view/no-image.png", null, "res://icon", null];
+    public items: Array<string> = ["res://icon", null, "~/ui-tests-app/resources/images/no-image.png", null, "~/ui-tests-app/resources/images/git no-image.png", null, "res://icon", null];
     constructor() {
         super();
 
diff --git a/apps/app/ui-tests-app/list-view/max-length.xml b/apps/app/ui-tests-app/list-view/max-length.xml
deleted file mode 100644
index 7fc095bbc..000000000
--- a/apps/app/ui-tests-app/list-view/max-length.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Page loaded="pageLoaded">
-    <Page.actionBar>
-        <ActionBar title="maxLength" />
-    </Page.actionBar>
-    <StackLayout>
-        <TextField id="maxLenghtFromCodeBehindWithText" hint="max lenght and text from code behind" maxLength="3" />
-        <TextField id="maxLenghtFromCodeBehind" hint="set only max length from code behind" />
-        <TextField id="inXml" text="in xml" hint="in xml" maxLength="3" />
-        <TextField id="useInput" hint="user input" maxLength="3" />
-        <TextField id="useInput" hint="user input" maxLength="3" secure="true" />
-        
-        <Button tap="setText" text="Revert to initial state" />
-    </StackLayout>
-</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/list-view/first-image.png b/apps/app/ui-tests-app/resources/images/first-image.png
similarity index 100%
rename from apps/app/ui-tests-app/list-view/first-image.png
rename to apps/app/ui-tests-app/resources/images/first-image.png
diff --git a/apps/app/ui-tests-app/list-view/no-image.png b/apps/app/ui-tests-app/resources/images/no-image.png
similarity index 100%
rename from apps/app/ui-tests-app/list-view/no-image.png
rename to apps/app/ui-tests-app/resources/images/no-image.png
diff --git a/apps/app/ui-tests-app/text-field/max-length.xml b/apps/app/ui-tests-app/text-field/max-length.xml
index 7fc095bbc..945c74d7f 100644
--- a/apps/app/ui-tests-app/text-field/max-length.xml
+++ b/apps/app/ui-tests-app/text-field/max-length.xml
@@ -7,8 +7,7 @@
         <TextField id="maxLenghtFromCodeBehind" hint="set only max length from code behind" />
         <TextField id="inXml" text="in xml" hint="in xml" maxLength="3" />
         <TextField id="useInput" hint="user input" maxLength="3" />
-        <TextField id="useInput" hint="user input" maxLength="3" secure="true" />
-        
+        <TextField id="useInput" hint="user input" maxLength="3" secure="true" />        
         <Button tap="setText" text="Revert to initial state" />
     </StackLayout>
 </Page>
\ No newline at end of file