diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb
index 24efcb08..0e8e5cf5 100644
--- a/Controls.DocumentViewer/DocumentViewer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.vb
@@ -646,6 +646,14 @@ Public Class DocumentViewer
         Return oFormat
     End Function
 
+    Private Function ToVisibility(pBoolean As Boolean) As XtraBars.BarItemVisibility
+        If (pBoolean = True) Then
+            Return XtraBars.BarItemVisibility.Always
+        Else
+            Return XtraBars.BarItemVisibility.Never
+        End If
+    End Function
+
     Private Sub UpdateMainUi()
 
         Select Case _Config?.Config?.PageFit
@@ -663,68 +671,75 @@ Public Class DocumentViewer
 
         Select Case _ViewerMode
             Case ViewerMode.GDPicture
-                buttonPrint.Enabled = _ToolbarSettings.ShowPrintButton
-                buttonFitWidth.Enabled = _ToolbarSettings.ShowFitWidthButton
-                buttonFitPage.Enabled = _ToolbarSettings.ShowFitPageButton
-                buttonZoomIn.Enabled = _ToolbarSettings.ShowZoomButton
-                buttonZoomOut.Enabled = _ToolbarSettings.ShowZoomButton
-                buttonRotateLeft.Enabled = _ToolbarSettings.ShowRotateButton
-                buttonRotateRight.Enabled = _ToolbarSettings.ShowRotateButton
-                buttonFlipX.Enabled = _ToolbarSettings.ShowFlipButton
-                buttonFlipY.Enabled = _ToolbarSettings.ShowFlipButton
-                buttonSettings.Enabled = _ToolbarSettings.ShowSettingButton
-                txtSearch.Enabled = _ToolbarSettings.ShowSearchButton
-                btnSearch2.Enabled = _ToolbarSettings.ShowSearchButton
-                btnNextHighlight.Enabled = _ToolbarSettings.ShowSearchButton
-                btnPrevHighlight.Enabled = _ToolbarSettings.ShowSearchButton
-                buttonFirstPage.Enabled = True
-                buttonPrevPage.Enabled = True
-                buttonNextPage.Enabled = True
-                buttonLastPage.Enabled = True
-                txtCurrentPage.Enabled = True
+                ToolbarDocumentViewer.Visible = True
+
+                buttonPrint.Visibility = ToVisibility(_ToolbarSettings.ShowPrintButton)
+                buttonFitWidth.Visibility = ToVisibility(_ToolbarSettings.ShowFitWidthButton)
+                buttonFitPage.Visibility = ToVisibility(_ToolbarSettings.ShowFitPageButton)
+                buttonZoomIn.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonZoomOut.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonRotateLeft.Visibility = ToVisibility(_ToolbarSettings.ShowRotateButton)
+                buttonRotateRight.Visibility = ToVisibility(_ToolbarSettings.ShowRotateButton)
+                buttonFlipX.Visibility = ToVisibility(_ToolbarSettings.ShowFlipButton)
+                buttonFlipY.Visibility = ToVisibility(_ToolbarSettings.ShowFlipButton)
+                buttonSettings.Visibility = ToVisibility(_ToolbarSettings.ShowSettingButton)
+                txtSearch.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
+                btnSearch2.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
+                btnNextHighlight.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
+                btnPrevHighlight.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
+                buttonFirstPage.Visibility = ToVisibility(True)
+                buttonPrevPage.Visibility = ToVisibility(True)
+                buttonNextPage.Visibility = ToVisibility(True)
+                buttonLastPage.Visibility = ToVisibility(True)
+                txtCurrentPage.Visibility = ToVisibility(True)
 
             Case ViewerMode.RichText
-                buttonFitWidth.Enabled = _ToolbarSettings.ShowFitWidthButton
-                buttonFitPage.Enabled = _ToolbarSettings.ShowFitPageButton
-                buttonZoomIn.Enabled = _ToolbarSettings.ShowZoomButton
-                buttonZoomOut.Enabled = _ToolbarSettings.ShowZoomButton
-                buttonNextPage.Enabled = True
-                buttonPrevPage.Enabled = True
+                ToolbarDocumentViewer.Visible = True
 
-                buttonPrint.Enabled = False
-                buttonRotateLeft.Enabled = False
-                buttonRotateRight.Enabled = False
-                buttonFlipX.Enabled = False
-                buttonFlipY.Enabled = False
-                buttonFirstPage.Enabled = False
-                buttonLastPage.Enabled = False
-                buttonSettings.Enabled = False
-                txtCurrentPage.Enabled = False
-                txtSearch.Enabled = False
-                btnSearch2.Enabled = False
-                btnNextHighlight.Enabled = False
-                btnPrevHighlight.Enabled = False
+                buttonFitWidth.Visibility = ToVisibility(_ToolbarSettings.ShowFitWidthButton)
+                buttonFitPage.Visibility = ToVisibility(_ToolbarSettings.ShowFitPageButton)
+                buttonZoomIn.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonZoomOut.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonNextPage.Visibility = ToVisibility(True)
+                buttonPrevPage.Visibility = ToVisibility(True)
+                buttonPrint.Visibility = ToVisibility(False)
+                buttonRotateLeft.Visibility = ToVisibility(False)
+                buttonRotateRight.Visibility = ToVisibility(False)
+                buttonFlipX.Visibility = ToVisibility(False)
+                buttonFlipY.Visibility = ToVisibility(False)
+                buttonFirstPage.Visibility = ToVisibility(False)
+                buttonLastPage.Visibility = ToVisibility(False)
+                buttonSettings.Visibility = ToVisibility(False)
+                txtCurrentPage.Visibility = ToVisibility(False)
+                txtSearch.Visibility = ToVisibility(False)
+                btnSearch2.Visibility = ToVisibility(False)
+                btnNextHighlight.Visibility = ToVisibility(False)
+                btnPrevHighlight.Visibility = ToVisibility(False)
 
             Case ViewerMode.Excel
-                buttonPrint.Enabled = False
-                buttonFitWidth.Enabled = False
-                buttonFitPage.Enabled = False
-                buttonZoomIn.Enabled = False
-                buttonZoomOut.Enabled = False
-                buttonRotateLeft.Enabled = False
-                buttonRotateRight.Enabled = False
-                buttonFlipX.Enabled = False
-                buttonFlipY.Enabled = False
-                buttonFirstPage.Enabled = False
-                buttonPrevPage.Enabled = False
-                buttonNextPage.Enabled = False
-                buttonLastPage.Enabled = False
-                buttonSettings.Enabled = False
-                txtCurrentPage.Enabled = False
-                txtSearch.Enabled = False
-                btnSearch2.Enabled = False
-                btnNextHighlight.Enabled = False
-                btnPrevHighlight.Enabled = False
+                ToolbarDocumentViewer.Visible = False
+
+                buttonPrint.Visibility = ToVisibility(False)
+                buttonFitWidth.Visibility = ToVisibility(False)
+                buttonFitPage.Visibility = ToVisibility(False)
+                buttonZoomIn.Visibility = ToVisibility(False)
+                buttonZoomOut.Visibility = ToVisibility(False)
+                buttonRotateLeft.Visibility = ToVisibility(False)
+                buttonRotateRight.Visibility = ToVisibility(False)
+                buttonFlipX.Visibility = ToVisibility(False)
+                buttonFlipY.Visibility = ToVisibility(False)
+                buttonFirstPage.Visibility = ToVisibility(False)
+                buttonPrevPage.Visibility = ToVisibility(False)
+                buttonNextPage.Visibility = ToVisibility(False)
+                buttonLastPage.Visibility = ToVisibility(False)
+                buttonSettings.Visibility = ToVisibility(False)
+                txtCurrentPage.Visibility = ToVisibility(False)
+                txtSearch.Visibility = ToVisibility(False)
+                btnSearch2.Visibility = ToVisibility(False)
+                btnNextHighlight.Visibility = ToVisibility(False)
+                btnPrevHighlight.Visibility = ToVisibility(False)
+
+
 
         End Select
     End Sub