diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogFragment.java
index c04f01618f4..16d93b74f56 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogFragment.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogFragment.java
@@ -56,19 +56,19 @@ public class DocumentDialogFragment extends DialogFragment implements DocumentDi
     private final String LOG_TAG = getClass().getSimpleName();
 
     @BindView(R.id.tv_document_action)
-    TextView tv_document_action;
+    TextView tvDocumentAction;
 
     @BindView(R.id.et_document_name)
-    EditText et_document_name;
+    EditText etDocumentName;
 
     @BindView(R.id.et_document_description)
-    EditText et_document_description;
+    EditText etDocumentDescription;
 
     @BindView(R.id.tv_choose_file)
-    TextView tv_choose_file;
+    TextView tvChooseFile;
 
     @BindView(R.id.bt_upload)
-    Button bt_upload;
+    Button btUpload;
 
     @Inject
     DocumentDialogPresenter mDocumentDialogPresenter;
@@ -124,16 +124,14 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
             savedInstanceState) {
         rootView = inflater.inflate(R.layout.dialog_fragment_document, container, false);
-
         ButterKnife.bind(this, rootView);
         mDocumentDialogPresenter.attachView(this);
-
         if (getResources().getString(R.string.update_document).equals(documentAction)) {
-            tv_document_action.setText(R.string.update_document);
-            et_document_name.setText(document.getName());
-            et_document_description.setText(document.getDescription());
+            tvDocumentAction.setText(R.string.update_document);
+            etDocumentName.setText(document.getName());
+            etDocumentDescription.setText(document.getDescription());
         } else if (getResources().getString(R.string.upload_document).equals(documentAction)) {
-            tv_document_action.setText(R.string.upload_document);
+            tvDocumentAction.setText(R.string.upload_document);
         }
 
         return rootView;
@@ -149,7 +147,7 @@ public void beginUpload() {
         }
     }
 
-    @OnClick(R.id.tv_choose_file)
+    @OnClick(R.id.btn_browse_document)
     public void openFilePicker() {
         checkPermissionAndRequest();
     }
@@ -162,13 +160,13 @@ public void openFilePicker() {
      */
     public void validateInput() throws RequiredFieldException {
 
-        documentName = et_document_name.getEditableText().toString();
+        documentName = etDocumentName.getEditableText().toString();
 
         if (documentName.length() == 0 || documentName.equals(""))
             throw new RequiredFieldException(getResources().getString(R.string.name),
                     getString(R.string.message_field_required));
 
-        documentDescription = et_document_description.getEditableText().toString();
+        documentDescription = etDocumentDescription.getEditableText().toString();
 
         if (documentDescription.length() == 0 || documentDescription.equals(""))
             throw new RequiredFieldException(getResources().getString(R.string.description),
@@ -285,11 +283,11 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                     }
 
                     if (fileChoosen != null) {
-                        tv_choose_file.setText(fileChoosen.getName());
+                        tvChooseFile.setText(fileChoosen.getName());
                     } else {
                         break;
                     }
-                    bt_upload.setEnabled(true);
+                    btUpload.setEnabled(true);
 
                 }
                 break;
@@ -338,4 +336,5 @@ public void onDestroyView() {
     public interface OnDialogFragmentInteractionListener {
         void initiateFileUpload(String name, String description);
     }
+
 }
diff --git a/mifosng-android/src/main/res/drawable/ic_folder_black_24dp.xml b/mifosng-android/src/main/res/drawable/ic_folder_black_24dp.xml
new file mode 100644
index 00000000000..846a16841e0
--- /dev/null
+++ b/mifosng-android/src/main/res/drawable/ic_folder_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+</vector>
diff --git a/mifosng-android/src/main/res/layout/dialog_fragment_document.xml b/mifosng-android/src/main/res/layout/dialog_fragment_document.xml
index b7dd4bfa1e4..0e259e40854 100755
--- a/mifosng-android/src/main/res/layout/dialog_fragment_document.xml
+++ b/mifosng-android/src/main/res/layout/dialog_fragment_document.xml
@@ -5,95 +5,122 @@
   ~ See https://github.com/openMF/android-client/blob/master/LICENSE.md
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-
-    <TableLayout
-        android:layout_width="match_parent"
+<LinearLayout android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="24dp"
+    android:layout_centerHorizontal="true"
+    android:minWidth="300dp"
+    android:minHeight="300dp"
+    android:scrollbars="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:padding="8dp"
-        android:id="@+id/tableLayout">
+        android:layout_width="match_parent"
+        android:orientation="vertical">
 
         <TextView
+            style="@style/Base.TextAppearance.AppCompat.Large"
             android:id="@+id/tv_document_action"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:paddingBottom="@dimen/layout_padding_30dp"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp"
+            android:paddingStart="24dp"
+            android:paddingTop="24dp"
             android:gravity="center"
-            android:padding="10dp"
             android:text="@string/upload_document"
-            />
+            android:textColor="@color/primary"
+            android:textStyle="bold"/>
 
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:id="@+id/tableRow1">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/name"
-                android:id="@+id/textView2" />
+        <android.support.design.widget.TextInputLayout
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp">
 
             <EditText
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
+                android:hint="@string/name"
                 android:id="@+id/et_document_name"
-                android:maxLines="3"
                 android:inputType="text"
-                android:scrollbars="vertical"/>
-        </TableRow>
-
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:id="@+id/tableRow2"
-            android:layout_marginTop="16dp">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/description"
-                android:id="@+id/textView3" />
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"/>
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/til_description"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp"
+            android:paddingTop="16dp">
 
             <EditText
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
+                android:hint="@string/description"
                 android:id="@+id/et_document_description"
-                android:maxLines="3"
-                android:inputType="text"
+                android:inputType="textMultiLine"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:scrollHorizontally="false"
                 android:scrollbars="vertical"/>
-        </TableRow>
-
-    </TableLayout>
+        </android.support.design.widget.TextInputLayout>
+
+
+            <android.support.design.widget.TextInputLayout
+                android:id="@+id/til_selected_file"
+                android:gravity="center"
+                android:layout_height="match_parent"
+                android:layout_weight=".7"
+                android:layout_width="match_parent"
+                android:paddingEnd="8dp"
+                android:paddingLeft="24dp"
+                android:paddingRight="24dp"
+                android:paddingTop="16dp">
+                <EditText
+                    android:hint="@string/selected_file"
+                    android:id="@+id/tv_choose_file"
+                    android:inputType="text"
+                    android:lines="1"
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:scrollHorizontally="false"
+                    android:enabled="false"
+                    android:scrollbars="vertical"/>
+            </android.support.design.widget.TextInputLayout>
+
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center">
 
+        <Button
+            android:drawableLeft="@drawable/ic_folder_black_24dp"
+            android:drawableStart="@drawable/ic_folder_black_24dp"
+            android:id="@+id/btn_browse_document"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:gravity="center"
+            android:layout_weight="0.5"
+            android:text="@string/browse"
+            android:backgroundTint="@color/primary"
+            android:textAllCaps="true" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/choose_file"
-        android:id="@+id/tv_choose_file"
-        android:layout_marginTop="16dp"
-        android:layout_below="@+id/tableLayout"
-        android:layout_centerHorizontal="true" />
-
-    <Button
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/upload"
-        android:id="@+id/bt_upload"
-        android:enabled="false"
-        android:layout_below="@+id/tv_choose_file"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="26dp" />
+        <Button
+            android:id="@+id/bt_upload"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:gravity="center"
+            android:text="@string/upload"
+            android:layout_weight="0.5"
+            android:textAllCaps="true"
+            android:backgroundTint="@color/primary" />
 
+    </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/mifosng-android/src/main/res/layout/dialog_fragment_identifier.xml b/mifosng-android/src/main/res/layout/dialog_fragment_identifier.xml
index 1567a52ed14..d3224b50f76 100644
--- a/mifosng-android/src/main/res/layout/dialog_fragment_identifier.xml
+++ b/mifosng-android/src/main/res/layout/dialog_fragment_identifier.xml
@@ -11,126 +11,119 @@
     android:layout_height="match_parent"
     android:inAnimation="@android:anim/fade_in"
     android:outAnimation="@android:anim/fade_out">
-
     <!-- Comment this out when editing the actual content -->
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        android:layout_width="wrap_content"
+    <!--<ProgressBar-->
+        <!--android:id="@+id/progress_bar"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_gravity="center"/>-->
+<LinearLayout android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="24dp"
+    android:layout_centerHorizontal="true"
+    android:minWidth="300dp"
+    android:minHeight="300dp"
+    android:scrollbars="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <TextView
+        style="@style/Base.TextAppearance.AppCompat.Large"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:paddingBottom="@dimen/layout_padding_30dp"
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp"
+        android:paddingStart="24dp"
+        android:paddingTop="24dp"
+        android:gravity="center"
+        android:text="@string/identifiers"
+        android:textColor="@color/primary"
+        android:textStyle="bold"/>
+    <LinearLayout
         android:layout_height="wrap_content"
-        android:layout_gravity="center"/>
-
-    <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-
-        <TableLayout
-            android:id="@+id/tableLayout"
+        android:orientation="vertical">
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:padding="8dp">
-
-            <TableRow
-                android:id="@+id/tableRow1"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-                <TextView
-                    android:id="@+id/tv_identifier_type"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/document_type"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                <Spinner
-                    android:id="@+id/sp_identifier_type"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/light_grey"
-                    android:spinnerMode="dropdown"/>
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/tableRow2"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_marginTop="16dp">
-
-
-                <TextView
-                    android:id="@+id/tv_status"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/status"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                <Spinner
-                    android:id="@+id/sp_identifier_status"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/light_grey"
-                    android:spinnerMode="dropdown"/>
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/tableRow3"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_marginTop="16dp">
-
-                <TextView
-                    android:id="@+id/tv_unique_id"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/unique_id"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                <EditText
-                    android:id="@+id/et_unique_id"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/light_grey"/>
-
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/tableRow4"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_marginTop="16dp">
-
-                <TextView
-                    android:id="@+id/tv_description"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/description"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                <EditText
-                    android:id="@+id/et_description"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/light_grey"/>
-
-            </TableRow>
+            android:paddingTop="10dp"
+            android:text="@string/document_type"
+            android:textSize="12sp"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp"
+            style="@style/Base.TextAppearance.AppCompat.Small" />
+        <android.support.v7.widget.AppCompatSpinner
+            style="@style/Widget.AppCompat.Spinner.Underlined"
+            android:id="@+id/sp_identifier_type"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:spinnerMode="dropdown"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="24dp"
+            android:paddingTop="10dp"
+            android:backgroundTint="@color/gray_dark"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="10dp"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp"
+            android:text="@string/status"
+            android:textSize="12sp"
+            style="@style/Base.TextAppearance.AppCompat.Small"
+            />
+        <android.support.v7.widget.AppCompatSpinner
+            style="@style/Widget.AppCompat.Spinner.Underlined"
+            android:id="@+id/sp_identifier_status"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="24dp"
+            android:spinnerMode="dropdown"
+            android:paddingTop="10dp"
+            android:backgroundTint="@color/gray_dark"/>
+    </LinearLayout>
+    <android.support.design.widget.TextInputLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp">
+
+        <EditText
+            android:hint="@string/unique_id"
+            android:id="@+id/et_unique_id"
+            android:inputType="text"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"/>
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp">
+
+        <EditText
+            android:hint="@string/description"
+            android:id="@+id/et_description"
+            android:inputType="text"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"/>
+    </android.support.design.widget.TextInputLayout>
+
+    <Button
+        android:id="@+id/btn_create_identifier"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_width="match_parent"
+        android:text="@string/create_identifier"
+        android:textAllCaps="true"
+        android:backgroundTint="@color/primary" />
 
-            <Button
-                android:id="@+id/btn_create_identifier"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="26dp"
-                android:text="@string/create_identifier"/>
-        </TableLayout>
-    </RelativeLayout>
-</ViewFlipper>
+</LinearLayout>
+</ViewFlipper>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
index f633126c546..f5dd2f8f8be 100755
--- a/mifosng-android/src/main/res/values/strings.xml
+++ b/mifosng-android/src/main/res/values/strings.xml
@@ -187,6 +187,8 @@
     <string name="logging_in">Logging In</string>
     <string name="back_again">Please press back again to exit</string>
     <string name="dialog_logout">Are you sure you want to logout?</string>
+    <string name="browse">Browse</string>
+    <string name="selected_file">Selected File</string>
     <!-- General Terms End Here -->