diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7da6d8ae..ecba2ef4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         <activity
             android:name=".ui.EditEntryActivity"
             android:label="Edit profile"
-            android:theme="@style/AppTheme.TransparentActionBar">
+            android:theme="@style/AppTheme.NoActionBar">
         </activity>
         <activity
             android:name=".ui.IntroActivity"
diff --git a/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java b/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java
index 07d90a99..e0bb13d8 100644
--- a/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java
@@ -231,9 +231,9 @@ public class EditEntryActivity extends AegisActivity {
     @Override
     protected void setPreferredTheme(boolean darkMode) {
         if (darkMode) {
-            setTheme(R.style.AppTheme_Dark_TransparentActionBar);
+            setTheme(R.style.AppTheme_Dark);
         } else {
-            setTheme(R.style.AppTheme_TransparentActionBar);
+            setTheme(R.style.AppTheme);
         }
     }
 
diff --git a/app/src/main/res/layout/activity_edit_entry.xml b/app/src/main/res/layout/activity_edit_entry.xml
index 5b8d4734..12d2ff89 100644
--- a/app/src/main/res/layout/activity_edit_entry.xml
+++ b/app/src/main/res/layout/activity_edit_entry.xml
@@ -13,8 +13,9 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="250dp"
-            android:background="@color/colorPrimary">
+            android:background="?attr/background"
+
+            android:layout_height="250dp">
 
             <de.hdodenhof.circleimageview.CircleImageView
                 xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -48,7 +49,10 @@
             </com.avito.android.krop.KropView>
 
         </RelativeLayout>
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/divider" />
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -57,7 +61,7 @@
             android:layout_marginEnd="35dp">
 
             <TableRow
-                android:layout_marginTop="5dp"
+                android:layout_marginTop="10dp"
                 android:layout_marginBottom="5dp">
                 <ImageView android:layout_column="0"
                     android:layout_width="wrap_content"
@@ -73,7 +77,7 @@
                     android:hint="Name"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:backgroundTint="#ff0000"
+                    android:backgroundTint="#949494"
                     android:layout_weight="1"/>
             </TableRow>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d8b42595..5dd20530 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,7 +21,7 @@
     <color name="colorSwirlPrimaryDark">#FFFFFF</color>
     <color name="colorSwirlErrorDark">#FF5252</color>
 
-    <color name="icon_primary">#212121</color>
+    <color name="icon_primary">#757575</color>
     <color name="icon_primary_inverted">#ffffff</color>
     <color name="icon_primary_dark">#ffffff</color>
     <color name="icon_primary_dark_inverted">#212121</color>