diff --git a/financius/src/main/java/com/code44/finance/ui/currencies/CurrencyActivity.java b/financius/src/main/java/com/code44/finance/ui/currencies/CurrencyActivity.java
index ef3dec3a..77f9540e 100644
--- a/financius/src/main/java/com/code44/finance/ui/currencies/CurrencyActivity.java
+++ b/financius/src/main/java/com/code44/finance/ui/currencies/CurrencyActivity.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
 import android.view.Menu;
 
 import com.code44.finance.R;
@@ -14,6 +16,14 @@ public static void start(Context context, String currencyServerId) {
         start(context, intent);
     }
 
+    @Override protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getToolbar().setElevation(0);
+        }
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
diff --git a/financius/src/main/res/layout/fragment_currency_edit.xml b/financius/src/main/res/layout/fragment_currency_edit.xml
index 2c17c3ea..3c7fa289 100644
--- a/financius/src/main/res/layout/fragment_currency_edit.xml
+++ b/financius/src/main/res/layout/fragment_currency_edit.xml
@@ -42,8 +42,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:labelFor="@+id/code_ET"
-                        android:paddingLeft="12dp"
-                        android:paddingRight="12dp"
+                        android:paddingLeft="4dp"
+                        android:paddingRight="4dp"
                         android:text="@string/currency_code"
                         android:textAppearance="@style/Text.Caption"
                         android:textColor="@color/text_primary_inverse" />
@@ -53,6 +53,7 @@
                         style="@style/EditText.Large"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:background="?editTextBackground"
                         android:contentDescription="@string/currency_code"
                         android:inputType="textCapCharacters"
                         android:maxLength="3"
@@ -75,8 +76,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:labelFor="@+id/symbol_ET"
-                        android:paddingLeft="12dp"
-                        android:paddingRight="12dp"
+                        android:paddingLeft="4dp"
+                        android:paddingRight="4dp"
                         android:text="@string/symbol"
                         android:textAppearance="@style/Text.Caption"
                         android:textColor="@color/text_primary_inverse" />
@@ -257,7 +258,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/currentMainCurrency_TV"
-                    android:layout_marginLeft="-12dp">
+                    android:layout_marginLeft="-4dp"
+                    android:layout_marginTop="@dimen/space_normal">
 
                     <EditText
                         android:id="@+id/exchangeRate_ET"
@@ -268,8 +270,7 @@
                         android:layout_weight="1"
                         android:hint="@string/exchange_rate"
                         android:inputType="numberDecimal"
-                        tools:ignore="NestedWeights"
-                        tools:stateListAnimator="@android:animator/fade_in" />
+                        tools:ignore="NestedWeights" />
 
                     <ImageButton
                         android:id="@+id/refreshRate_B"
@@ -280,8 +281,7 @@
                         android:minHeight="0dp"
                         android:minWidth="0dp"
                         android:scaleType="centerInside"
-                        android:src="@drawable/ic_action_refresh_inverse"
-                        tools:stateListAnimator="@android:animator/fade_in" />
+                        android:src="@drawable/ic_action_refresh" />
 
                 </LinearLayout>