diff --git a/app/src/main/java/com/keepassdroid/EntryEditActivity.java b/app/src/main/java/com/keepassdroid/EntryEditActivity.java
index 5c87b1a2f..44f06e33e 100644
--- a/app/src/main/java/com/keepassdroid/EntryEditActivity.java
+++ b/app/src/main/java/com/keepassdroid/EntryEditActivity.java
@@ -49,6 +49,7 @@ import com.keepassdroid.database.PwGroup;
 import com.keepassdroid.database.PwGroupId;
 import com.keepassdroid.database.PwGroupV3;
 import com.keepassdroid.database.PwGroupV4;
+import com.keepassdroid.database.PwIconStandard;
 import com.keepassdroid.database.edit.AddEntry;
 import com.keepassdroid.database.edit.OnFinish;
 import com.keepassdroid.database.edit.RunnableOnFinish;
@@ -258,6 +259,8 @@ public abstract class EntryEditActivity extends LockCloseHideActivity
 		
 		PwDatabase db = App.getDB().pm;
 		newEntry.setTitle(Util.getEditText(this, R.id.entry_title), db);
+		if(mSelectedIconID != -1)
+		    newEntry.setIcon(new PwIconStandard(mSelectedIconID));
 		newEntry.setUrl(Util.getEditText(this, R.id.entry_url), db);
 		newEntry.setUsername(Util.getEditText(this, R.id.entry_user_name), db);
 		newEntry.setNotes(Util.getEditText(this, R.id.entry_comment), db);
@@ -352,7 +355,7 @@ public abstract class EntryEditActivity extends LockCloseHideActivity
 	protected void fillData() {
 		ImageButton currIconButton = (ImageButton) findViewById(R.id.icon_button);
 		App.getDB().drawFactory.assignDrawableTo(currIconButton, getResources(), mEntry.getIcon());
-		
+
 		populateText(R.id.entry_title, mEntry.getTitle());
 		populateText(R.id.entry_user_name, mEntry.getUsername());
 		populateText(R.id.entry_url, mEntry.getUrl());
diff --git a/app/src/main/java/com/keepassdroid/database/PwEntry.java b/app/src/main/java/com/keepassdroid/database/PwEntry.java
index 9e1eb2e50..ee2213301 100644
--- a/app/src/main/java/com/keepassdroid/database/PwEntry.java
+++ b/app/src/main/java/com/keepassdroid/database/PwEntry.java
@@ -126,11 +126,14 @@ public abstract class PwEntry implements Cloneable {
 	public abstract void setLastAccessTime(Date access);
 	public abstract void setExpires(boolean exp);
 	public abstract void setExpiryTime(Date expires);
-	
-	
+
 	public PwIcon getIcon() {
 		return icon;
 	}
+
+    public void setIcon(PwIconStandard icon) {
+        this.icon = icon;
+    }
 	
 	public boolean isTan() {
 		return getTitle().equals(PMS_TAN_ENTRY) && (getUsername().length() > 0);