diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index 105b768e..eb64b87c 100644
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -116,6 +116,8 @@ void FileBar::retranslateUi()
     _action_save->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_SAVE), "&Save..."));
     _action_export->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_EXPORT), "&Export..."));
     _action_capture->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_CAPTURE), "&Capture..."));
+
+    auto_resize();
 }
 
 void FileBar::reStyle()
@@ -253,5 +255,16 @@ void FileBar::update_view_status()
     _menu_session->setEnabled(bEnable && is_hardware); 
 }
 
+void FileBar::auto_resize()
+{   
+    std::vector<QToolButton*> wids;
+    wids.push_back(&_file_button);
+    
+    for(auto bt : wids){
+        int w = bt->fontMetrics().boundingRect(bt->text()).width();
+        bt->setMinimumWidth(w+5);
+    }           
+}
+
 } // namespace toolbars
 } // namespace pv
diff --git a/DSView/pv/toolbars/filebar.h b/DSView/pv/toolbars/filebar.h
index 27212805..31dd44b6 100644
--- a/DSView/pv/toolbars/filebar.h
+++ b/DSView/pv/toolbars/filebar.h
@@ -46,6 +46,8 @@ public:
 
     QString genDefaultSessionFile();
 
+    void auto_resize();
+
 private:
     void changeEvent(QEvent *event);
     void retranslateUi();
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 3ceabd8d..508ab1ae 100644
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -214,6 +214,8 @@ namespace pv
             _action_single->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_CAPTURE_MODE_SINGLE), "&Single"));
             _action_repeat->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_CAPTURE_MODE_REPEAT), "&Repetitive"));
             _action_loop->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_CAPTURE_MODE_LOOP), "&Loop"));
+
+            auto_resize();
         }
 
         void SamplingBar::reStyle()
@@ -1293,5 +1295,19 @@ namespace pv
             on_instant_stop();
         }
 
+        void SamplingBar::auto_resize()
+        {   
+            std::vector<QToolButton*> wids;
+            wids.push_back(&_configure_button);
+            wids.push_back(&_mode_button);
+            wids.push_back(&_run_stop_button);
+            wids.push_back(&_instant_button);
+            
+            for(auto bt : wids){
+                int w = bt->fontMetrics().boundingRect(bt->text()).width();
+                bt->setMinimumWidth(w+5);
+            }           
+        }
+
     } // namespace toolbars
 } // namespace pv
diff --git a/DSView/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
index f838aede..27c24abb 100644
--- a/DSView/pv/toolbars/samplingbar.h
+++ b/DSView/pv/toolbars/samplingbar.h
@@ -100,6 +100,8 @@ namespace pv
 
             void commit_settings();
 
+            void auto_resize();
+
         signals:
             void sig_store_session_data();
 
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index defe5dfe..42362633 100644
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -153,6 +153,8 @@ void TrigBar::retranslateUi()
     _action_math->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FUNCTION_MATH), "Math"));
 
     _action_dispalyOptions->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DISPLAY_OPTIONS), "Options"));
+
+    auto_resize();
 }
 
 void TrigBar::reStyle()
@@ -343,5 +345,20 @@ void TrigBar::on_actionLissajous_triggered()
     }
  }
 
+   void TrigBar::auto_resize()
+    {   
+        std::vector<QToolButton*> wids;
+        wids.push_back(&_trig_button);
+        wids.push_back(&_protocol_button);
+        wids.push_back(&_measure_button);
+        wids.push_back(&_search_button);
+        wids.push_back(&_setting_button);
+        
+        for(auto bt : wids){
+            int w = bt->fontMetrics().boundingRect(bt->text()).width();
+            bt->setMinimumWidth(w+5);
+        }           
+    }
+
 } // namespace toolbars
 } // namespace pv
diff --git a/DSView/pv/toolbars/trigbar.h b/DSView/pv/toolbars/trigbar.h
index 4b3e887e..c9b3a2b0 100644
--- a/DSView/pv/toolbars/trigbar.h
+++ b/DSView/pv/toolbars/trigbar.h
@@ -46,6 +46,7 @@ public:
     explicit TrigBar(SigSession *session, QWidget *parent = 0);
     void reload();
     void update_view_status();
+    void auto_resize();
 
 private:
     void changeEvent(QEvent *event);