diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp
index 616b74b7..022ce2f4 100644
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@@ -2593,14 +2593,14 @@ UBGraphicsTriangle* UBSvgSubsetAdaptor::UBSvgSubsetReader::triangleFromSvg()
     QStringRef svgWidth = mXmlReader.attributes().value("width");
     QStringRef svgHeight = mXmlReader.attributes().value("height");
 
-	UBGraphicsTriangle::UBGraphicsTriangleOrientation orientation = 
-		UBGraphicsTriangle::orientationFromStr((mXmlReader.attributes().value("orientation")));
+        UBGraphicsTriangle::UBGraphicsTriangleOrientation orientation =
+                UBGraphicsTriangle::orientationFromStr((mXmlReader.attributes().value("orientation")));
 
     if (!svgX.isNull() && !svgY.isNull() && !svgWidth.isNull() && !svgHeight.isNull())
     {
         triangle->setRect(svgX.toString().toFloat(), svgY.toString().toFloat()
                             , svgWidth.toString().toFloat(), svgHeight.toString().toFloat(),
-							orientation);
+                                                        orientation);
     }
 
     triangle->setVisible(true);
diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp
index aa2f824d..b1e8e3ff 100644
--- a/src/core/UBDisplayManager.cpp
+++ b/src/core/UBDisplayManager.cpp
@@ -117,7 +117,7 @@ void UBDisplayManager::setAsControl(QWidget* pControlWidget )
         mControlWidget->showFullScreen();
 		// !!!! Should be included into Windows after QT recompilation
 #ifdef Q_WS_MAC
-        mControlWidget->setAttribute(Qt::WA_MacNoShadow);
+//        mControlWidget->setAttribute(Qt::WA_MacNoShadow);
 #endif
     }
 }
@@ -133,7 +133,7 @@ void UBDisplayManager::setAsDisplay(QWidget* pDisplayWidget)
         mDisplayWidget->showFullScreen();
 		// !!!! Should be included into Windows after QT recompilation
 #ifdef Q_WS_MAC
-        mDisplayWidget->setAttribute(Qt::WA_MacNoShadow);
+//        mDisplayWidget->setAttribute(Qt::WA_MacNoShadow);
 #endif
     }
 }
diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp
index 08a8b5cb..62836456 100644
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -64,7 +64,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
     mTransparentDrawingView->setAttribute(Qt::WA_TranslucentBackground, true);
 	// !!!! Should be included into Windows after QT recompilation
 #ifdef Q_WS_MAC
-    mTransparentDrawingView->setAttribute(Qt::WA_MacNoShadow, true);
+    //mTransparentDrawingView->setAttribute(Qt::WA_MacNoShadow, true);
 #endif
     mTransparentDrawingView->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::Window);
     mTransparentDrawingView->setCacheMode(QGraphicsView::CacheNone);
diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp
index 1e3d1a64..d167c2f5 100644
--- a/src/gui/UBDockPalette.cpp
+++ b/src/gui/UBDockPalette.cpp
@@ -38,7 +38,7 @@ UBDockPalette::UBDockPalette(QWidget *parent, const char *name)
 
 	// !!!! Should be included into Windows after QT recompilation
 #ifdef Q_WS_MAC
-        setAttribute(Qt::WA_MacNoShadow);
+        //setAttribute(Qt::WA_MacNoShadow);
 #endif
 
     }
diff --git a/src/gui/UBFloatingPalette.cpp b/src/gui/UBFloatingPalette.cpp
index 9171a0f4..511bc9ef 100644
--- a/src/gui/UBFloatingPalette.cpp
+++ b/src/gui/UBFloatingPalette.cpp
@@ -33,8 +33,8 @@ UBFloatingPalette::UBFloatingPalette(Qt::Corner position, QWidget *parent)
         setAttribute(Qt::WA_MacAlwaysShowToolWindow);
 #endif
 #ifdef Q_WS_MAC
-        setAttribute(Qt::WA_MacNonActivatingToolWindow);
-        setAttribute(Qt::WA_MacNoShadow);
+        //setAttribute(Qt::WA_MacNonActivatingToolWindow);
+        //setAttribute(Qt::WA_MacNoShadow);
 #endif
     }
 
diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp
index 86ad687c..cf81d4ae 100644
--- a/src/pdf/XPDFRenderer.cpp
+++ b/src/pdf/XPDFRenderer.cpp
@@ -127,8 +127,9 @@ void XPDFRenderer::render(QPainter *p, int pageNumber, const QRectF &bounds)
         qreal xscale = p->worldTransform().m11();
         qreal yscale = p->worldTransform().m22();
         bool bZoomChanged = false;
+        bool bFirstThumbnail = false;
 
-        if(mScaleX != xscale || mScaleY != yscale)
+        if(fabs(mScaleX - xscale) > 0.1 || fabs(mScaleY - yscale) > 0.1)
         {
             mScaleX = xscale;
             mScaleY = yscale;
@@ -138,9 +139,14 @@ void XPDFRenderer::render(QPainter *p, int pageNumber, const QRectF &bounds)
         // First verify if the thumbnails and the pages are generated
         if(!bThumbGenerated)
         {
+            if(pageNumber == 1)
+            {
+                bFirstThumbnail = true;
+            }
 
             if(!mThumbMap[pageNumber - 1])
             {
+
                 // Generate the thumbnail
                 mThumbs << *createPDFImage(pageNumber, xscale, yscale, bounds);
                 mThumbMap[pageNumber - 1] = true;
@@ -164,10 +170,9 @@ void XPDFRenderer::render(QPainter *p, int pageNumber, const QRectF &bounds)
             }
         }
 
-        // Warning: verify pagenumber
         QImage pdfImage;
 
-        if(!bThumbGenerated)
+        if(!bThumbGenerated || bFirstThumbnail)
         {
             pdfImage = mThumbs.at(pageNumber - 1);
         }
@@ -176,8 +181,6 @@ void XPDFRenderer::render(QPainter *p, int pageNumber, const QRectF &bounds)
             pdfImage = mNumPageToPageMap[pageNumber];
         }
 
-        pdfImage.rect();
-
         QTransform savedTransform = p->worldTransform();
         p->resetTransform();
         p->drawImage(QPointF(savedTransform.dx() + mSliceX, savedTransform.dy() + mSliceY), pdfImage);
diff --git a/src/tools/UBAbstractDrawRuler.h b/src/tools/UBAbstractDrawRuler.h
index f89e493b..00f92916 100644
--- a/src/tools/UBAbstractDrawRuler.h
+++ b/src/tools/UBAbstractDrawRuler.h
@@ -72,4 +72,4 @@ class UBAbstractDrawRuler : public QObject
 
 };
 
-#endif
\ No newline at end of file
+#endif