diff --git a/core/src/main/assets/mimic.png b/core/src/main/assets/mimic.png
index 1d8e5f201..473575c35 100644
Binary files a/core/src/main/assets/mimic.png and b/core/src/main/assets/mimic.png differ
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalMimic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalMimic.java
index 8f048ab9b..d07c41c5b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalMimic.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalMimic.java
@@ -69,16 +69,23 @@ public class CrystalMimic extends Mimic {
 	@Override
 	public String description() {
 		if (alignment == Alignment.NEUTRAL){
+			String desc = null;
 			for (Item i : items){
 				if (i instanceof Artifact){
-					return Messages.get(Heap.class, "crystal_chest_desc", Messages.get(Heap.class, "artifact"));
+					desc = Messages.get(Heap.class, "crystal_chest_desc", Messages.get(Heap.class, "artifact"));
+					break;
 				} else if (i instanceof Ring){
-					return Messages.get(Heap.class, "crystal_chest_desc", Messages.get(Heap.class, "ring"));
+					desc = Messages.get(Heap.class, "crystal_chest_desc", Messages.get(Heap.class, "ring"));
+					break;
 				} else if (i instanceof Wand){
-					return Messages.get(Heap.class, "crystal_chest_desc", Messages.get(Heap.class, "wand"));
+					desc = Messages.get(Heap.class, "crystal_chest_desc", Messages.get(Heap.class, "wand"));
+					break;
 				}
 			}
-			return Messages.get(Heap.class, "locked_chest_desc");
+			if (desc == null) {
+				desc = Messages.get(Heap.class, "locked_chest_desc");
+			}
+			return desc + "\n\n" + Messages.get(this, "hidden_hint");
 		} else {
 			return super.description();
 		}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GoldenMimic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GoldenMimic.java
index 5a8cade6d..2815f31f1 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GoldenMimic.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GoldenMimic.java
@@ -55,7 +55,7 @@ public class GoldenMimic extends Mimic {
 	@Override
 	public String description() {
 		if (alignment == Alignment.NEUTRAL){
-			return Messages.get(Heap.class, "locked_chest_desc");
+			return Messages.get(Heap.class, "locked_chest_desc") + "\n\n" + Messages.get(this, "hidden_hint");
 		} else {
 			return super.description();
 		}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java
index 46027f9ba..5bbebdc8a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java
@@ -103,7 +103,7 @@ public class Mimic extends Mob {
 	@Override
 	public String description() {
 		if (alignment == Alignment.NEUTRAL){
-			return Messages.get(Heap.class, "chest_desc");
+			return Messages.get(Heap.class, "chest_desc") + "\n\n" + Messages.get(this, "hidden_hint");
 		} else {
 			return super.description();
 		}
@@ -179,7 +179,7 @@ public class Mimic extends Mob {
 
 	@Override
 	public int attackSkill( Char target ) {
-		if (target != null && alignment == Alignment.NEUTRAL){
+		if (target != null && alignment == Alignment.NEUTRAL && target.invisible <= 0){
 			return INFINITE_ACCURACY;
 		} else {
 			return 6 + level;
diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties
index 90efe2eb1..dd1330fb0 100644
--- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties
+++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties
@@ -525,7 +525,7 @@ actors.mobs.gnolltrickster.name=gnoll trickster
 actors.mobs.gnolltrickster.desc=A strange looking creature, even by gnoll standards. It hunches forward with a wicked grin, almost cradling the satchel hanging over its shoulder. Its eyes are wide with a strange mix of fear and excitement.\n\nThere is a large collection of poorly made darts in its satchel, they all seem to be tipped with various harmful substances.
 
 actors.mobs.goldenmimic.name=golden mimic
-actors.mobs.goldenmimic.desc=Mimics are magical creatures which can take any shape they wish. In dungeons they almost always choose a shape of a treasure chest, in order to lure in unsuspecting adventurers.\n\nGolden mimics are tougher mimics which try to attract the strongest adventurers. They have the best loot, but are also much stronger than regular mimics.
+actors.mobs.goldenmimic.desc=Mimics are magical creatures which can take any shape they wish. In dungeons they almost always choose a shape of a treasure chest, in order to lure in unsuspecting adventurers.\n\nGolden mimics are tougher mimics which try to attract the strongest adventurers. They have better loot, but are also much stronger than regular mimics.
 
 actors.mobs.golem.name=golem
 actors.mobs.golem.def_verb=blocked
@@ -566,6 +566,7 @@ actors.mobs.king$undead.desc=These undead dwarves, risen by the will of the King
 
 actors.mobs.mimic.name=mimic
 actors.mobs.mimic.reveal=That chest is a mimic!
+actors.mobs.mimic.hidden_hint=Something about this chest feels off... Walking up and trying to open it might be a bad idea.
 actors.mobs.mimic.desc=Mimics are magical creatures which can take any shape they wish. In dungeons they almost always choose a shape of a treasure chest, in order to lure in unsuspecting adventurers.\n\nMimics have a nasty bite, but often hold more treasure than a regular chest.
 
 actors.mobs.necromancer.name=necromancer