diff --git a/NEWS b/NEWS
index b88ce7c0d..397c1c391 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ New features
  - 
 
 Enhancements
- - 
+ - limit the maximum width of toolbar buttons
  
 
 Bug fixes
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 63b28075d..4f75ed85c 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -1123,6 +1123,11 @@ A.toolbarButton:hover SPAN {
   line-height: 13px;
   padding: 5px 2px 5px 5px;
   cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  min-width: 50px;
+  max-width: 100px;
 }
 
 A.smallToolbarButton SPAN,