Index: /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp	(revision 73696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp	(revision 73697)
@@ -95,5 +95,5 @@
 {
     /* Create widget: */
-    UIVMLogViewerWidget *pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, m_pActionPool, m_comMachine, this);
+    UIVMLogViewerWidget *pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, m_pActionPool, true /* show toolbar */, m_comMachine, this);
     if (pWidget)
     {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp	(revision 73696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp	(revision 73697)
@@ -60,4 +60,5 @@
 UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding,
                                          UIActionPool *pActionPool,
+                                         bool fShowToolbar /* = true */,
                                          const CMachine &comMachine /* = CMachine() */,
                                          QWidget *pParent /* = 0 */)
@@ -65,4 +66,5 @@
     , m_enmEmbedding(enmEmbedding)
     , m_pActionPool(pActionPool)
+    , m_fShowToolbar(fShowToolbar)
     , m_comMachine(comMachine)
     , m_fIsPolished(false)
@@ -421,5 +423,6 @@
     /* Prepare stuff: */
     prepareActions();
-    prepareToolBar();
+    if (m_fShowToolbar)
+        prepareToolBar();
     prepareWidgets();
     /* Load settings: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h	(revision 73696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h	(revision 73697)
@@ -62,7 +62,8 @@
       * @param  enmEmbedding  Brings the type of widget embedding.
       * @param  pActionPool   Brings the action-pool reference.
+      * @param  fShowToolbar  Brings whether we should create/show toolbar.
       * @param  comMachine    Brings the machine for which VM Log-Viewer is requested. */
     UIVMLogViewerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
-                        const CMachine &comMachine = CMachine(), QWidget *pParent = 0);
+                        bool fShowToolbar = true, const CMachine &comMachine = CMachine(), QWidget *pParent = 0);
     /** Destructs the VM Log-Viewer. */
     ~UIVMLogViewerWidget();
@@ -188,4 +189,6 @@
     /** Hold sthe action-pool reference. */
     UIActionPool *m_pActionPool;
+    /** Holds whether we should create/show toolbar. */
+    const bool    m_fShowToolbar;
     /** Holds the machine instance. */
     CMachine      m_comMachine;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp	(revision 73696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp	(revision 73697)
@@ -154,5 +154,5 @@
             {
                 /* Create the Logviewer pane: */
-                m_pPaneLogViewer = new UIVMLogViewerWidget(EmbedTo_Stack, m_pActionPool);
+                m_pPaneLogViewer = new UIVMLogViewerWidget(EmbedTo_Stack, m_pActionPool, false /* show toolbar */);
                 AssertPtrReturnVoid(m_pPaneLogViewer);
                 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp	(revision 73696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp	(revision 73697)
@@ -113,4 +113,5 @@
     , m_pMachineMenuAction(0)
     , m_pSnapshotMenuAction(0)
+    , m_pLogViewerMenuAction(0)
     , m_pManagerVirtualMedia(0)
     , m_pManagerHostNetwork(0)
@@ -1220,15 +1221,19 @@
     prepareMenuMachineClose(actionPool()->action(UIActionIndexST_M_Machine_M_Close)->menu());
 
-    /* Prepare Group-menu: */
+    /* Prepare 'Group' menu: */
     prepareMenuGroup(actionPool()->action(UIActionIndexST_M_Group)->menu());
     m_pGroupMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Group)->menu());
 
-    /* Prepare Machine-menu: */
+    /* Prepare 'Machine' menu: */
     prepareMenuMachine(actionPool()->action(UIActionIndexST_M_Machine)->menu());
     m_pMachineMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Machine)->menu());
 
-    /* Prepare Snapshot-menu: */
+    /* Prepare 'Snapshot' menu: */
     prepareMenuSnapshot(actionPool()->action(UIActionIndexST_M_Snapshot)->menu());
     m_pSnapshotMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Snapshot)->menu());
+
+    /* Prepare 'Log Viewer' menu: */
+    prepareMenuLogViewer(actionPool()->action(UIActionIndex_M_LogViewer)->menu());
+    m_pLogViewerMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndex_M_LogViewer)->menu());
 
 #ifdef VBOX_WS_MAC
@@ -1239,5 +1244,5 @@
 #endif
 
-    /* Prepare Help-menu: */
+    /* Prepare 'Help' menu: */
     menuBar()->addMenu(actionPool()->action(UIActionIndex_Menu_Help)->menu());
 
@@ -1639,4 +1644,22 @@
 }
 
+void UIVirtualBoxManager::prepareMenuLogViewer(QMenu *pMenu)
+{
+    /* We are doing it inside the UIActionPool. */
+    Q_UNUSED(pMenu);
+
+    /* Do not touch if filled already: */
+    if (!m_logViewerActions.isEmpty())
+        return;
+
+    /* Remember action list: */
+    m_logViewerActions << actionPool()->action(UIActionIndex_M_LogViewer_T_Find)
+                 << actionPool()->action(UIActionIndex_M_LogViewer_T_Filter)
+                 << actionPool()->action(UIActionIndex_M_LogViewer_T_Bookmark)
+                 << actionPool()->action(UIActionIndex_M_LogViewer_T_Settings)
+                 << actionPool()->action(UIActionIndex_M_LogViewer_S_Refresh)
+                 << actionPool()->action(UIActionIndex_M_LogViewer_S_Save);
+}
+
 void UIVirtualBoxManager::prepareStatusBar()
 {
@@ -1932,4 +1955,8 @@
     m_pSnapshotMenuAction->setVisible(fSnapshotMenuShown);
 
+    /* Determine whether LogViewer actions should be visible: */
+    const bool fLogViewerMenuShown = fMachineOrGroupMenuShown && m_pWidget->currentMachineTool() == ToolTypeMachine_LogViewer;
+    m_pLogViewerMenuAction->setVisible(fLogViewerMenuShown);
+
     /* Hide action shortcuts: */
     if (!fMachineMenuShown)
@@ -1947,4 +1974,6 @@
     foreach (UIAction *pAction, m_snapshotActions)
         pAction->setVisible(fSnapshotMenuShown);
+    foreach (UIAction *pAction, m_logViewerActions)
+        pAction->setVisible(fLogViewerMenuShown);
 
     /* Show action shortcuts: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h	(revision 73696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h	(revision 73697)
@@ -250,4 +250,6 @@
         /** Prepares @a pMenu Snapshot. */
         void prepareMenuSnapshot(QMenu *pMenu);
+        /** Prepares @a pMenu Log Viewer. */
+        void prepareMenuLogViewer(QMenu *pMenu);
         /** Prepares status-bar. */
         void prepareStatusBar();
@@ -355,4 +357,9 @@
     QAction          *m_pSnapshotMenuAction;
 
+    /** Holds the list of Log Viewer menu actions. */
+    QList<UIAction*>  m_logViewerActions;
+    /** Holds the Log menu parent action. */
+    QAction          *m_pLogViewerMenuAction;
+
     /** Holds the Virtual Media Manager window instance. */
     QIManagerDialog *m_pManagerVirtualMedia;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp	(revision 73696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp	(revision 73697)
@@ -404,6 +404,8 @@
         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
 
-        /* Add Snapshot actions block: */
+        /* Separator: */
         m_pToolBar->addSeparator();
+
+        /* Add 'Snapshot' actions block: */
         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Snapshot_S_Take));
         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Snapshot_S_Delete));
@@ -411,4 +413,12 @@
         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Snapshot_T_Properties));
         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Snapshot_S_Clone));
+
+        /* Add 'Log Viewer' actions block: */
+        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_S_Save));
+        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_T_Find));
+        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_T_Filter));
+        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_T_Bookmark));
+        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_T_Settings));
+        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_S_Refresh));
 
 #ifdef VBOX_WS_MAC