diff --git a/app/src/main/res/drawable/category_rectangle.xml b/app/src/main/res/drawable/category_rectangle.xml
deleted file mode 100644
index 1516662d4..000000000
--- a/app/src/main/res/drawable/category_rectangle.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle"   android:dither="true">
-            <corners android:topLeftRadius="2dp" android:bottomLeftRadius="2dp"/>
-            <solid android:color="@color/deep_orange_500" />
-
-            <padding android:bottom="16dp"
-                android:left="16dp"
-                android:right="16dp"
-                android:top="16dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gray_rectangle.xml b/app/src/main/res/drawable/gray_rectangle.xml
deleted file mode 100644
index b1858c80f..000000000
--- a/app/src/main/res/drawable/gray_rectangle.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle"
-            android:dither="true">
-            <corners android:radius="2dp"/>
-            <solid android:color="#ccc" />
-
-        </shape>
-    </item>
-
-    <item android:bottom="2dp">
-        <shape android:shape="rectangle"   android:dither="true">
-            <corners android:radius="2dp" />
-            <solid android:color="@android:color/darker_gray" />
-
-            <padding android:bottom="8dp"
-                android:left="8dp"
-                android:right="8dp"
-                android:top="8dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/oval.xml b/app/src/main/res/drawable/oval.xml
deleted file mode 100644
index d2149d04c..000000000
--- a/app/src/main/res/drawable/oval.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape android:shape="oval"  android:dither="true">
-            <corners android:radius="2dp"/>
-            <solid android:color="#eee" />
-            <gradient
-                android:startColor="#aaa"
-                android:centerColor="#aaa"
-                android:endColor="@android:color/transparent"
-                android:gradientRadius="55"
-                android:type="radial"
-                />
-
-            <padding android:bottom="5dp"
-                android:left="5dp"
-                android:right="5dp"
-                android:top="5dp" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="oval"   android:dither="true">
-            <corners android:radius="2dp" />
-            <solid android:color="@android:color/white" />
-
-            <padding android:bottom="8dp"
-                android:left="8dp"
-                android:right="8dp"
-                android:top="8dp" />
-        </shape>
-    </item>
-
-
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/password_rectangle.xml b/app/src/main/res/drawable/password_rectangle.xml
deleted file mode 100644
index e1a191273..000000000
--- a/app/src/main/res/drawable/password_rectangle.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle"   android:dither="true">
-            <corners android:topLeftRadius="2dp" android:bottomLeftRadius="2dp"/>
-            <solid android:color="@color/blue_grey_500" />
-
-            <padding android:bottom="16dp"
-                android:left="16dp"
-                android:right="16dp"
-                android:top="16dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/password_row_background.xml b/app/src/main/res/drawable/password_row_background.xml
deleted file mode 100644
index 8f39b0562..000000000
--- a/app/src/main/res/drawable/password_row_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/selected_rectangle" />
-    <item android:drawable="@drawable/rectangle" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml
index b5dfba531..3c79b37d0 100644
--- a/app/src/main/res/layout/activity_pgp_handler.xml
+++ b/app/src/main/res/layout/activity_pgp_handler.xml
@@ -13,7 +13,6 @@
     <GridLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/rectangle"
         android:orientation="horizontal">
 
         <TextView
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index b86005c21..6c8fc1ffe 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -10,35 +10,44 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:padding="16dp"
         android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/rectangle"
             android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/holo_blue_light"
+                android:textColor="@color/grey_500"
                 android:text="CATEGORY HERE"
                 android:id="@+id/crypto_password_category"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"/>
+                android:textSize="18dp"
+                android:textIsSelectable="false"
+                android:layout_marginLeft="16dp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/holo_orange_dark"
+                android:textColor="@color/accent"
                 android:textStyle="bold"
                 android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
                 android:text="PASSWORD FILE NAME HERE"
                 android:id="@+id/crypto_password_file"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"/>
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:textSize="24dp" />
         </LinearLayout>
 
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@drawable/divider"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp" />
+
         <ProgressBar
             style="?android:attr/progressBarStyleLarge"
             android:layout_width="wrap_content"
@@ -61,12 +70,7 @@
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/rectangle"
             android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
             android:visibility="invisible">
 
             <GridLayout
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index 84fe99c33..1ee8e3c98 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -10,7 +10,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/rectangle"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin">
@@ -40,7 +39,6 @@
         android:layout_height="fill_parent"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:layout_marginBottom="@dimen/activity_vertical_margin"
-        android:background="@drawable/rectangle"
         android:layout_weight="1">
         <LinearLayout
             android:id="@+id/crypto_container"