diff --git a/app/src/androidTest/assets/views/HabitHistoryView/render.png b/app/src/androidTest/assets/views/HabitHistoryView/render.png
index fce176813..499e282c4 100644
Binary files a/app/src/androidTest/assets/views/HabitHistoryView/render.png and b/app/src/androidTest/assets/views/HabitHistoryView/render.png differ
diff --git a/app/src/androidTest/assets/views/HabitHistoryView/renderDataOffset.png b/app/src/androidTest/assets/views/HabitHistoryView/renderDataOffset.png
index 679ad00d4..98f26dfa6 100644
Binary files a/app/src/androidTest/assets/views/HabitHistoryView/renderDataOffset.png and b/app/src/androidTest/assets/views/HabitHistoryView/renderDataOffset.png differ
diff --git a/app/src/androidTest/assets/views/HabitHistoryView/renderDifferentSize.png b/app/src/androidTest/assets/views/HabitHistoryView/renderDifferentSize.png
index be64fb851..10d0e0d32 100644
Binary files a/app/src/androidTest/assets/views/HabitHistoryView/renderDifferentSize.png and b/app/src/androidTest/assets/views/HabitHistoryView/renderDifferentSize.png differ
diff --git a/app/src/androidTest/assets/views/HabitHistoryView/renderTransparent.png b/app/src/androidTest/assets/views/HabitHistoryView/renderTransparent.png
index d52288da7..bddba2b02 100644
Binary files a/app/src/androidTest/assets/views/HabitHistoryView/renderTransparent.png and b/app/src/androidTest/assets/views/HabitHistoryView/renderTransparent.png differ
diff --git a/app/src/androidTest/assets/views/HabitScoreView/render.png b/app/src/androidTest/assets/views/HabitScoreView/render.png
index f5c98549c..25e501db4 100644
Binary files a/app/src/androidTest/assets/views/HabitScoreView/render.png and b/app/src/androidTest/assets/views/HabitScoreView/render.png differ
diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderDataOffset.png b/app/src/androidTest/assets/views/HabitScoreView/renderDataOffset.png
index c84c230a1..5196acd2f 100644
Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderDataOffset.png and b/app/src/androidTest/assets/views/HabitScoreView/renderDataOffset.png differ
diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderDifferentSize.png b/app/src/androidTest/assets/views/HabitScoreView/renderDifferentSize.png
index 133068dc4..7457ddb08 100644
Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderDifferentSize.png and b/app/src/androidTest/assets/views/HabitScoreView/renderDifferentSize.png differ
diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderMonthly.png b/app/src/androidTest/assets/views/HabitScoreView/renderMonthly.png
index 83c31bcfe..cd40166cc 100644
Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderMonthly.png and b/app/src/androidTest/assets/views/HabitScoreView/renderMonthly.png differ
diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderTransparent.png b/app/src/androidTest/assets/views/HabitScoreView/renderTransparent.png
index b6fd78857..1ac09fa6f 100644
Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderTransparent.png and b/app/src/androidTest/assets/views/HabitScoreView/renderTransparent.png differ
diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderYearly.png b/app/src/androidTest/assets/views/HabitScoreView/renderYearly.png
index 1e45b47d1..0d262e37f 100644
Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderYearly.png and b/app/src/androidTest/assets/views/HabitScoreView/renderYearly.png differ
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java
index 6748dc895..f78e017db 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java
@@ -89,7 +89,7 @@ public class HabitHistoryViewTest extends ViewTest
     public void tapDate_withEditableView() throws Throwable
     {
         view.setIsEditable(true);
-        tap(view, 270, 30);
+        tap(view, 270, 18); // today's square
         waitForAsyncTasks();
 
         long today = DateHelper.getStartOfToday();
@@ -103,7 +103,7 @@ public class HabitHistoryViewTest extends ViewTest
 
         view.setIsEditable(true);
         tap(view, 45, 5); // header
-        tap(view, 270, 43); // tomorrow's square
+        tap(view, 270, 30); // tomorrow's square
         tap(view, 280, 30); // right axis
         waitForAsyncTasks();
 
diff --git a/run_tests b/run_tests
index 1125bbb4c..637af5b6c 100755
--- a/run_tests
+++ b/run_tests
@@ -40,7 +40,7 @@ grep -q "FAILURES\!\!\!" ${OUTPUT_DIR}/runner.txt && failed=1
 
 info "Fetching failed generated files..."
 mkdir -p ${OUTPUT_DIR}/failed
-adb pull /sdcard/Android/data/${PACKAGE_NAME}/cache/Failed \
+adb pull /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots/ \
     ${OUTPUT_DIR}/failed >> $LOG 2>> $LOG
 adb shell rm -r /sdcard/Android/data/${PACKAGE_NAME}/cache/ >> $LOG 2>> $LOG