diff --git a/sources/bordertitleblock.cpp b/sources/bordertitleblock.cpp
index 116d02b9b..e1f3c2dd4 100644
--- a/sources/bordertitleblock.cpp
+++ b/sources/bordertitleblock.cpp
@@ -423,8 +423,8 @@ void BorderTitleBlock::draw(QPainter *painter)
 	painter -> setFont(QETApp::diagramTextsFont());
 	
 		//Draw the empty case at the top left of diagram when there is header
-	if (display_border_ && (display_columns_ || display_rows_)) {
-		painter -> setBrush(Qt::white);
+	if (display_border_ && (display_columns_ || display_rows_))
+	{
 		QRectF first_rectangle(
 			diagram_rect_.topLeft().x(),
 			diagram_rect_.topLeft().y(),
diff --git a/sources/dvevent/dveventaddshape.cpp b/sources/dvevent/dveventaddshape.cpp
index b6c6d43cd..a1a1b4129 100644
--- a/sources/dvevent/dveventaddshape.cpp
+++ b/sources/dvevent/dveventaddshape.cpp
@@ -188,7 +188,7 @@ void DVEventAddShape::updateHelpCross(const QPoint &p)
 		QPen pen;
 		pen.setWidthF(0.4);
 		pen.setCosmetic(true);
-		pen.setColor(Qt::darkGray);
+		pen.setColor(Diagram::background_color == Qt::darkGray ? Qt::lightGray : Qt::darkGray);
 
 		QRectF rect = m_diagram -> border_and_titleblock.insideBorderRect();
 
diff --git a/sources/qetgraphicsitem/terminal.cpp b/sources/qetgraphicsitem/terminal.cpp
index 5a7e07d0b..d6331c245 100644
--- a/sources/qetgraphicsitem/terminal.cpp
+++ b/sources/qetgraphicsitem/terminal.cpp
@@ -314,7 +314,7 @@ void Terminal::paint(QPainter *p, const QStyleOptionGraphicsItem *options, QWidg
 		{
 			m_help_line_a = new QGraphicsLineItem(this);
 			QPen pen;
-			pen.setColor(Qt::darkGray);
+			pen.setColor(Diagram::background_color == Qt::darkGray ? Qt::lightGray : Qt::darkGray);
 			m_help_line_a -> setPen(pen);
 		}
 
diff --git a/sources/titleblocktemplate.cpp b/sources/titleblocktemplate.cpp
index 55d88f2ab..3fe40e929 100644
--- a/sources/titleblocktemplate.cpp
+++ b/sources/titleblocktemplate.cpp
@@ -1233,7 +1233,6 @@ void TitleBlockTemplate::render(QPainter &painter, const DiagramContext &diagram
 	QPen pen(Qt::black);
 	pen.setCosmetic(true);
 	painter.setPen(pen);
-	painter.setBrush(Qt::white);
 	
 	// draw the titleblock border
 	painter.drawRect(QRect(0, 0, titleblock_width, titleblock_height));
@@ -1322,7 +1321,6 @@ void TitleBlockTemplate::renderCell(QPainter &painter, const TitleBlockCell &cel
 	QPen pen(QBrush(), 0.0, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
 	pen.setColor(Qt::black);
 	painter.setPen(pen);
-	painter.setBrush(Qt::white);
 	painter.drawRect(cell_rect);
 	
 	painter.save();