diff --git a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
index 95107b15..e4f55133 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
@@ -16,7 +16,6 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import org.gitnex.tea4j.v2.models.ContentsResponse;
 import org.mian.gitnex.R;
@@ -78,7 +77,6 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 		binding.recyclerView.setHasFixedSize(true);
 		binding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 		binding.recyclerView.setAdapter(filesAdapter);
-		binding.recyclerView.addItemDecoration(new DividerItemDecoration(binding.recyclerView.getContext(), DividerItemDecoration.VERTICAL));
 
 		binding.breadcrumbsView.setItems(new ArrayList<>(Collections.singletonList(BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot) + getResources().getString(R.string.colonDivider) + repository.getBranchRef()))));
 		// noinspection unchecked
diff --git a/app/src/main/res/layout/fragment_files.xml b/app/src/main/res/layout/fragment_files.xml
index 0b228b3b..e0cdab69 100644
--- a/app/src/main/res/layout/fragment_files.xml
+++ b/app/src/main/res/layout/fragment_files.xml
@@ -15,29 +15,53 @@
         android:visibility="gone"
         tools:visibility="visible">
 
-        <moe.feng.common.view.breadcrumbs.BreadcrumbsView
-            android:id="@+id/breadcrumbs_view"
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:saveEnabled="false"
-            android:text="@string/filesBreadcrumbRoot"
-            app:CustomTextSize="16sp"
-            app:SelectedTextColor="?attr/primaryTextColor"
-            app:UnSelectedTextColor="@color/lightGray" />
+            style="?attr/materialCardViewFilledStyle"
+            android:layout_margin="@dimen/dimen8dp"
+            app:cardElevation="@dimen/dimen0dp">
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/pullToRefresh"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerView"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?attr/primaryBackgroundColor"
-                android:scrollbars="vertical" />
+                android:layout_height="wrap_content"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:background="?attr/materialCardBackgroundColor"
+                android:orientation="horizontal">
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                    <moe.feng.common.view.breadcrumbs.BreadcrumbsView
+                        android:id="@+id/breadcrumbs_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:saveEnabled="false"
+                        android:text="@string/filesBreadcrumbRoot"
+                        app:CustomTextSize="@dimen/dimen16sp"
+                        app:SelectedTextColor="?attr/primaryTextColor"
+                        app:UnSelectedTextColor="@color/lightGray" />
+
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/primaryBackgroundColor"
+            android:padding="@dimen/dimen8dp">
+
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/pullToRefresh"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+        </FrameLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_files.xml b/app/src/main/res/layout/list_files.xml
index 6c32c668..907a49d8 100644
--- a/app/src/main/res/layout/list_files.xml
+++ b/app/src/main/res/layout/list_files.xml
@@ -1,69 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/fileFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    android:focusable="true"
+    android:paddingTop="@dimen/dimen4dp"
+    android:paddingBottom="@dimen/dimen4dp"
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
-    <ImageView
-        android:id="@+id/fileTypeIs"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="15dp"
-        android:contentDescription="@string/generalImgContentText"
-        android:src="@drawable/ic_file" />
-
-    <LinearLayout
-        android:id="@+id/infoSection"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/fileName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/defaultFilename"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+        style="?attr/materialCardViewFilledStyle"
+        app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
-            android:id="@+id/infoRow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:foreground="?android:attr/selectableItemBackground"
+            android:background="?attr/materialCardBackgroundColor"
+            android:padding="@dimen/dimen12dp"
             android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/fileInfo"
+            <ImageView
+                android:id="@+id/fileTypeIs"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/sizeCopy"
-                android:textColor="?attr/hintColor"
-                android:textSize="12sp"
-                android:visibility="gone"
-                tools:visibility="visible" />
+                android:layout_marginEnd="@dimen/dimen16dp"
+                android:contentDescription="@string/generalImgContentText"
+                android:src="@drawable/ic_file" />
+
+            <LinearLayout
+                android:id="@+id/infoSection"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/fileName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/defaultFilename"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen16sp" />
+
+                <LinearLayout
+                    android:id="@+id/infoRow"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/fileInfo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/sizeCopy"
+                        android:textColor="?attr/hintColor"
+                        android:textSize="@dimen/dimen12sp"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                </LinearLayout>
+
+            </LinearLayout>
 
         </LinearLayout>
 
-        <!--
-
-        <ImageView
-            android:id="@+id/filesDropdownMenu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:contentDescription="@string/menuContentDesc"
-            android:scaleType="fitEnd"
-            android:src="@drawable/ic_dotted_menu_horizontal"
-            android:visibility="gone" />
-
-        -->
-
-    </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>