diff --git a/build.mac.sh b/build.mac.sh
index 49f03cf6c16..661f6655336 100755
--- a/build.mac.sh
+++ b/build.mac.sh
@@ -52,8 +52,8 @@ then
  # for additional details
  ./autogen.sh $AUTOGEN_FLAGS --prefix=${1} \
                              --enable-static=no \
-                             --enable-unittests \
                              --with-qtdir=$QTDIR 
+                             #--enable-unittests \
                              #--with-grass=/usr/lib/grass  
 make && make install
 
diff --git a/images/themes/default/mActionStartEditing.png b/images/themes/default/mActionStartEditing.png
index 22b4ecb7676..49b1de9b18c 100644
Binary files a/images/themes/default/mActionStartEditing.png and b/images/themes/default/mActionStartEditing.png differ
diff --git a/images/themes/default/mActionStopEditing.png b/images/themes/default/mActionStopEditing.png
index 912ff2e3774..f6bf66e9302 100644
Binary files a/images/themes/default/mActionStopEditing.png and b/images/themes/default/mActionStopEditing.png differ
diff --git a/tests/src/core/Makefile.am b/tests/src/core/Makefile.am
index c1a9f8e6791..dae48befd85 100644
--- a/tests/src/core/Makefile.am
+++ b/tests/src/core/Makefile.am
@@ -64,6 +64,7 @@ GLOBALCXXFLAGS = $(CXXFLAGS) \
 				$(EXTRA_CXXFLAGS) \
 				$(GDAL_CFLAGS) \
 				$(QT_CXXFLAGS) \
+        $(GEOS_CFLAGS) \
 				$(PG_INC) \
 				-I../../../src/raster \
 				-I../../../src/core \