diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp
index 04cada95a..f906c8d2b 100644
--- a/src/gui/components/cc_frm_button.cpp
+++ b/src/gui/components/cc_frm_button.cpp
@@ -199,8 +199,8 @@ void CComponentsButton::initCaption()
 		 * These dimensions must be enough to display complete content like possible icon and without truncated text.
 		 */
 		Font *tmp_font = cc_btn_font;
-		int h_cap = min(cc_btn_text_obj->getHeight(), tmp_font->getHeight());
-		int w_cap = tmp_font->getRenderWidth(cc_btn_text);
+		int h_cap = min(cc_btn_text_obj->getHeight(), tmp_font->getHeight()) + OFFSET_INNER_MIN;
+		int w_cap = max(tmp_font->getRenderWidth(cc_btn_text),  width - x_offset - dx_icon_obj - 2*frame);
 		int dx_tmp = x_offset + dx_icon_obj + w_cap - frame;
 
 		/* If the required sum for space of icon, text, frame and offsets is too small then adapt font size.