diff --git a/src/keepass2android/Resources/layout/entry_edit.xml b/src/keepass2android/Resources/layout/entry_edit.xml
index a5b1ab86..0e629176 100644
--- a/src/keepass2android/Resources/layout/entry_edit.xml
+++ b/src/keepass2android/Resources/layout/entry_edit.xml
@@ -17,8 +17,8 @@
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:padding="8dp"
-                android:layout_margin="0dp"
-                android:scaleType="fitXY"
+                android:layout_margin="2dp"
+                android:scaleType="fitCenter"
                 android:layout_alignParentRight="true"
                 android:src="@drawable/ic00" />
             <android.support.design.widget.TextInputLayout
diff --git a/src/keepass2android/icons/DrawableFactory.cs b/src/keepass2android/icons/DrawableFactory.cs
index dc223f5d..c1bb16fc 100644
--- a/src/keepass2android/icons/DrawableFactory.cs
+++ b/src/keepass2android/icons/DrawableFactory.cs
@@ -98,30 +98,14 @@ namespace keepass2android
 					return _blank;
 				}
 					
-				bitmap = resize (bitmap);
-
 				draw = new BitmapDrawable(res, bitmap);
 				_customIconMap[icon] = draw;
 			}
 				
 			return draw;
 		}
-			
-		/** Resize the custom icon to match the built in icons
-	 * @param bitmap
-	 * @return
-	 */
-		private Bitmap resize (Bitmap bitmap)
-		{
-			int width = bitmap.Width;
-			int height = bitmap.Height;
-				
-			if (width == _blankWidth && height == _blankHeight) {
-				return bitmap;
-			}
-				
-			return Bitmap.CreateScaledBitmap (bitmap, _blankWidth, _blankHeight, true);
-		}
+		
+		
 			
 		public void Clear ()
 		{