diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt
index 04227a1a..991ce304 100755
--- a/DSView/CMakeLists.txt
+++ b/DSView/CMakeLists.txt
@@ -281,6 +281,7 @@ set(DSView_HEADERS
     pv/view/logicsignal.h
     pv/view/analogsignal.h
     pv/view/dsosignal.h
+    mystyle.h
 )
 
 set(DSView_FORMS
@@ -421,7 +422,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_
 # Install the executable.
 install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
 install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
-install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)
+install(FILES icons/logo.svg DESTINATION share/${PROJECT_NAME} RENAME logo.svg)
 install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25)
 install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31)
 install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf)
diff --git a/DSView/DSView.qrc b/DSView/DSView.qrc
index 692ac4e3..1fa1c2a1 100755
--- a/DSView/DSView.qrc
+++ b/DSView/DSView.qrc
@@ -1,11 +1,9 @@
 <RCC>
     <qresource prefix="/">
         <file>icons/Blackman.png</file>
-        <file>icons/dsl_logo.png</file>
         <file>icons/Flat_top.png</file>
         <file>icons/Hamming.png</file>
         <file>icons/Hann.png</file>
-        <file>icons/logo.png</file>
         <file>icons/Rectangle.png</file>
         <file>icons/mAmplitude.png</file>
         <file>icons/mBurst.png</file>
@@ -139,5 +137,6 @@
         <file>icons/light/restore.svg</file>
         <file>icons/dsl_logo.svg</file>
         <file>icons/dark/minimize.svg</file>
+        <file>icons/logo.svg</file>
     </qresource>
 </RCC>
diff --git a/DSView/icons/logo.svg b/DSView/icons/logo.svg
index 91e81c92..97bdfb4c 100644
--- a/DSView/icons/logo.svg
+++ b/DSView/icons/logo.svg
@@ -16,7 +16,7 @@
    version="1.1"
    id="svg8"
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="drawing.svg">
+   sodipodi:docname="logo.svg">
   <defs
      id="defs2" />
   <sodipodi:namedview
@@ -26,9 +26,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="421.85018"
-     inkscape:cy="103.16379"
+     inkscape:zoom="22.627417"
+     inkscape:cx="53.169061"
+     inkscape:cy="29.002585"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
diff --git a/DSView/pv/dialogs/calibration.cpp b/DSView/pv/dialogs/calibration.cpp
index 37f25ab6..36298622 100755
--- a/DSView/pv/dialogs/calibration.cpp
+++ b/DSView/pv/dialogs/calibration.cpp
@@ -270,7 +270,7 @@ void Calibration::on_save()
                         tr("Cancel"),0,0,this,flags);
     dlg.setWindowModality(Qt::WindowModal);
     dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
-                       Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
+                       Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
     dlg.setCancelButton(NULL);
 
     QFutureWatcher<void> watcher;
@@ -297,7 +297,7 @@ void Calibration::on_abort()
                         tr("Cancel"),0,0,this,flags);
     dlg.setWindowModality(Qt::WindowModal);
     dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
-                       Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
+                       Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
     dlg.setCancelButton(NULL);
 
     QFutureWatcher<void> watcher;
diff --git a/DSView/pv/dialogs/dsdialog.cpp b/DSView/pv/dialogs/dsdialog.cpp
index a387979e..359a4971 100755
--- a/DSView/pv/dialogs/dsdialog.cpp
+++ b/DSView/pv/dialogs/dsdialog.cpp
@@ -36,7 +36,7 @@ DSDialog::DSDialog(QWidget *parent, bool hasClose) :
     QDialog(parent),
     _moving(false)
 {
-    setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+    setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
     setAttribute(Qt::WA_TranslucentBackground);
 
     build_main(hasClose);
diff --git a/DSView/pv/dialogs/dsmessagebox.cpp b/DSView/pv/dialogs/dsmessagebox.cpp
index 793c2b00..70445d7e 100755
--- a/DSView/pv/dialogs/dsmessagebox.cpp
+++ b/DSView/pv/dialogs/dsmessagebox.cpp
@@ -50,7 +50,7 @@ DSMessageBox::DSMessageBox(QWidget *parent) :
     _main->setGraphicsEffect(bodyShadow);
 
     _msg = new QMessageBox(this);
-    _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+    _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
 
     _titlebar = new toolbars::TitleBar(false, this);
     _titlebar->setTitle(tr("Message"));
diff --git a/DSView/pv/dialogs/protocolexp.cpp b/DSView/pv/dialogs/protocolexp.cpp
index da5f222d..8c42a24e 100755
--- a/DSView/pv/dialogs/protocolexp.cpp
+++ b/DSView/pv/dialogs/protocolexp.cpp
@@ -200,7 +200,7 @@ void ProtocolExp::accept()
                                 tr("Cancel"),0,100,this,flags);
             dlg.setWindowModality(Qt::WindowModal);
             dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
-                               Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
+                               Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
 
             QFutureWatcher<void> watcher;
             connect(&watcher,SIGNAL(finished()),&dlg,SLOT(cancel()));
diff --git a/DSView/pv/dialogs/waitingdialog.cpp b/DSView/pv/dialogs/waitingdialog.cpp
index cdceef07..f4144ec5 100755
--- a/DSView/pv/dialogs/waitingdialog.cpp
+++ b/DSView/pv/dialogs/waitingdialog.cpp
@@ -108,7 +108,7 @@ void WaitingDialog::accept()
                         tr("Cancel"),0,0,this,flags);
     dlg.setWindowModality(Qt::WindowModal);
     dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
-                       Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
+                       Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
     dlg.setCancelButton(NULL);
 
     QFutureWatcher<void> watcher;
@@ -137,7 +137,7 @@ void WaitingDialog::reject()
                         tr("Cancel"),0,0,this,flags);
     dlg.setWindowModality(Qt::WindowModal);
     dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
-                       Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
+                       Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
     dlg.setCancelButton(NULL);
 
     QFutureWatcher<void> watcher;
diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
index f8c8acfe..0892d229 100755
--- a/DSView/pv/dock/measuredock.cpp
+++ b/DSView/pv/dock/measuredock.cpp
@@ -480,7 +480,7 @@ void MeasureDock::show_all_coursor()
 
     QDialog cursor_dlg(_widget);
     cursor_dlg.setWindowFlags(Qt::FramelessWindowHint | Qt::Popup | Qt::WindowSystemMenuHint |
-                              Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
+                              Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
 
     int index = 0;
     QGridLayout *glayout = new QGridLayout(&cursor_dlg);
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 2559aeec..52f9f5a8 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -821,7 +821,7 @@ void ProtocolDock::search_update()
                             tr("Cancel"),0,0,this,flags);
         dlg.setWindowModality(Qt::WindowModal);
         dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
-                           Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
+                           Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
         dlg.setCancelButton(NULL);
 
         QFutureWatcher<void> watcher;
diff --git a/DSView/pv/dock/searchdock.cpp b/DSView/pv/dock/searchdock.cpp
index bf2159f9..162b58a0 100755
--- a/DSView/pv/dock/searchdock.cpp
+++ b/DSView/pv/dock/searchdock.cpp
@@ -165,7 +165,7 @@ void SearchDock::on_previous()
                             tr("Cancel"),0,0,this,flags);
         dlg.setWindowModality(Qt::WindowModal);
         dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
-                           Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
+                           Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
         dlg.setCancelButton(NULL);
 
         QFutureWatcher<void> watcher;
@@ -225,7 +225,7 @@ void SearchDock::on_next()
                             tr("Cancel"),0,0,this,flags);
         dlg.setWindowModality(Qt::WindowModal);
         dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
-                           Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
+                           Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
         dlg.setCancelButton(NULL);
 
         QFutureWatcher<void> watcher;
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index 69b2af03..3c59035b 100755
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -52,14 +52,18 @@ MainFrame::MainFrame(DeviceManager &device_manager,
     setAttribute(Qt::WA_TranslucentBackground);
     // Make this a borderless window which can't
     // be resized or moved via the window system
+    #ifdef _WIN32
     setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+    #else
+    setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
+    #endif
     setMinimumHeight(minHeight);
     setMinimumWidth(minWidth);
     //resize(1024, 768);
 
     // Set the window icon
     QIcon icon;
-    icon.addFile(QString::fromUtf8(":/icons/logo.png"),
+    icon.addFile(QString::fromUtf8(":/icons/logo.svg"),
         QSize(), QIcon::Normal, QIcon::Off);
     setWindowIcon(icon);
 
@@ -422,7 +426,7 @@ void MainFrame::show_doc()
         QLabel tipsLabel;
         tipsLabel.setPixmap(QPixmap(":/icons/showDoc"+QString::number(_mainWindow->language())+".png"));
         QMessageBox msg;
-        msg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+        msg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
         msg.setContentsMargins(0, 0, 0, 0);
         connect(&msg, SIGNAL(buttonClicked(QAbstractButton*)), &dlg, SLOT(accept()));
         QPushButton *noMoreButton = msg.addButton(tr("Not Show Again"), QMessageBox::ActionRole);