diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderList.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderList.java
index 0940b0c337f47ba02c310647c2d1118cf03dfd7e..0e90d786f1fe4c3eebefee42660c101f8b2b6f2f 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderList.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderList.java
@@ -86,8 +86,7 @@ public class FolderList extends Composite {
     private Color listBackground;
     private Color hoverGradientStart;
     private Color hoverGradientEnd;
-    private Color defaultGradientStart;
-    private Color defaultGradientEnd;
+    private Color elementBackground;
     private Color indentedDefaultBackground;
     private Color indentedHoverBackground;
     private Color navigationElementShadowStroke;
@@ -203,9 +202,10 @@ public class FolderList extends Composite {
                 e.gc.setBackground(indentedDefaultBackground);
                 e.gc.fillRectangle(0, 2, bounds.width - 1, bounds.height - 1);
             } else {
-                e.gc.setForeground(defaultGradientStart);
-                e.gc.setBackground(defaultGradientEnd);
-                e.gc.fillGradientRectangle(0, 2, bounds.width - 1, bounds.height - 1, true);
+                e.gc.setBackground(elementBackground);
+                e.gc.fillRectangle(0, 2, bounds.width - 1, bounds.height - 1);
+                //e.gc.setBackground(defaultGradientEnd);
+                //e.gc.fillGradientRectangle(0, 2, bounds.width - 1, bounds.height - 1, true);
             }
 
             if (!selected) {
@@ -750,11 +750,20 @@ public class FolderList extends Composite {
 		 * white 20% + INFO_BACKGROUND 60% end colour WIDGET_NORMAL_SHADOW 100% +
 		 * INFO_BACKGROUND 40%
 		 */
+        /*
         defaultGradientStart = sharedColors.getColor(
             UIUtils.blend(infoBackground,
                 UIUtils.blend(white, widgetNormalShadow.getRGB(), 20), 60)
         );
         defaultGradientEnd = sharedColors.getColor(UIUtils.blend(infoBackground, widgetNormalShadow.getRGB(), 40));
+        */
+        if (widgetNormalShadow.hashCode() < widgetBackground.hashCode()) {
+            // Foreground darker than background - make element background darker
+            elementBackground = sharedColors.getColor(UIUtils.blend(black, widgetBackground.getRGB(), 15));
+        } else {
+            // Make element background lighter
+            elementBackground = sharedColors.getColor(UIUtils.blend(white, widgetBackground.getRGB(), 15));
+        }
 
         navigationElementShadowStroke = sharedColors.getColor(UIUtils.blend(white, widgetNormalShadow.getRGB(), 55));
         bottomNavigationElementShadowStroke1 = sharedColors.getColor(UIUtils.blend(black, widgetBackground.getRGB(), 10));
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
index 5932d6d8bbf6750cb04878639bf796417e168b48..990e29b6afec45d3af5c10b1d73bb3603ac6ab8d 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
@@ -1569,7 +1569,7 @@ public class SQLEditor extends SQLEditorBase implements
                     if (outputViewer.isHasNewOutput()) {
                         outputViewer.scrollToEnd();
                         CTabItem outputItem = UIUtils.getTabItem(resultTabs, outputViewer);
-                        if (outputItem != resultTabs.getSelection()) {
+                        if (outputItem != null && outputItem != resultTabs.getSelection()) {
                             outputItem.setImage(IMG_OUTPUT_ALERT);
                         }
                     }