diff --git a/app/src/main/res/layout/copy_item.xml b/app/src/main/res/layout/copy_item.xml
index 3f8737b0..31c43251 100644
--- a/app/src/main/res/layout/copy_item.xml
+++ b/app/src/main/res/layout/copy_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    android:id="@+id/dialog_holder"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/create_new.xml b/app/src/main/res/layout/create_new.xml
index 9112cef3..b2ea150c 100644
--- a/app/src/main/res/layout/create_new.xml
+++ b/app/src/main/res/layout/create_new.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    android:id="@+id/dialog_holder"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -9,7 +9,7 @@
     android:paddingRight="@dimen/activity_margin"
     android:paddingTop="@dimen/activity_margin">
 
-    <EditText
+    <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/item_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -20,17 +20,17 @@
     <RadioGroup
         android:id="@+id/dialog_radio_group"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checkedButton="@+id/dialog_radio_directory">
+        android:layout_height="wrap_content">
 
-        <RadioButton
+        <com.simplemobiletools.commons.views.MyCompatRadioButton
             android:id="@+id/dialog_radio_directory"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/medium_margin"
+            android:checked="true"
             android:text="@string/directory"/>
 
-        <RadioButton
+        <com.simplemobiletools.commons.views.MyCompatRadioButton
             android:id="@+id/dialog_radio_file"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_properties.xml b/app/src/main/res/layout/item_properties.xml
deleted file mode 100644
index 5b0ec6c4..00000000
--- a/app/src/main/res/layout/item_properties.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/properties_holder"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_margin"
-    android:paddingRight="@dimen/activity_margin"/>
diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
index 687a15b5..398d0ea0 100644
--- a/app/src/main/res/layout/list_item.xml
+++ b/app/src/main/res/layout/list_item.xml
@@ -21,7 +21,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:src="@drawable/ic_folder"/>
 
-        <TextView
+        <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/item_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
             android:paddingTop="@dimen/small_margin"
             android:text="Directory"/>
 
-        <TextView
+        <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/item_details"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/property_item.xml b/app/src/main/res/layout/property_item.xml
deleted file mode 100644
index b23cef4b..00000000
--- a/app/src/main/res/layout/property_item.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/property_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/activity_margin"
-        android:textSize="@dimen/smaller_text_size"/>
-
-    <TextView
-        android:id="@+id/property_value"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/small_margin"
-        android:paddingRight="@dimen/small_margin"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/rename_item.xml b/app/src/main/res/layout/rename_item.xml
index cdd4bdd6..2dbd466d 100644
--- a/app/src/main/res/layout/rename_item.xml
+++ b/app/src/main/res/layout/rename_item.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    android:id="@+id/dialog_holder"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="@dimen/activity_margin">
 
-    <EditText
+    <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/item_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"