diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp
index 01c3be3a6..f964a7f06 100644
--- a/src/gui/components/cc_frm_window.cpp
+++ b/src/gui/components/cc_frm_window.cpp
@@ -3,7 +3,7 @@
 	Copyright (C) 2001 by Steffen Hehn 'McClean'
 
 	Classes for generic GUI-related components.
-	Copyright (C) 2012-2014 Thilo Graf 'dbt'
+	Copyright (C) 2012-2016 Thilo Graf 'dbt'
 	Copyright (C) 2012, Michael Liebmann 'micha-bbg'
 
 	License: GPL
@@ -144,6 +144,7 @@ void CComponentsWindow::initVarWindow(	const int& x_pos, const int& y_pos, const
 	ccw_right_sidebar= NULL;	
 	ccw_body	= NULL;
 	ccw_footer	= NULL;
+	ccw_button_font	= g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL];
 
 	ccw_buttons	= 0; //no header buttons
 	ccw_show_footer = true;
@@ -218,6 +219,7 @@ void CComponentsWindow::initFooter()
 		ccw_footer->setWidth(width-2*fr_thickness);
 		ccw_footer->enableShadow(shadow);
 		ccw_footer->setCorner(corner_rad, CORNER_BOTTOM);
+		ccw_footer->setButtonFont(ccw_button_font);
 		ccw_footer->setColorBody(ccw_col_footer);
 	}
 }
diff --git a/src/gui/components/cc_frm_window.h b/src/gui/components/cc_frm_window.h
index da09fb342..b88187458 100644
--- a/src/gui/components/cc_frm_window.h
+++ b/src/gui/components/cc_frm_window.h
@@ -3,7 +3,7 @@
 	Copyright (C) 2001 by Steffen Hehn 'McClean'
 
 	Classes for generic GUI-related components.
-	Copyright (C) 2012, 2013, 2014, Thilo Graf 'dbt'
+	Copyright (C) 2012-2016, Thilo Graf 'dbt'
 
 	License: GPL
 
@@ -89,6 +89,8 @@ class CComponentsWindow : public CComponentsForm
 		fb_pixel_t ccw_col_head_text;
 		///footer bg color
 		fb_pixel_t ccw_col_footer;
+		///footer button font
+		Font*	ccw_button_font;
 
 		///initialze header object
 		void initHeader();
@@ -190,6 +192,8 @@ class CComponentsWindow : public CComponentsForm
 
 		///set background to footer
 		void setWindowFooterColor(const fb_pixel_t& color){ccw_col_footer = color;}
+		///set font for footer buttons
+		void setWindowFooterFont(Font* font_type){ccw_button_font = font_type;}
 
 		///returns a pointer to the internal left side bar object, use this to get access to left sidebar properities
 		CComponentsFrmChain* getLeftSidebarObject(){return ccw_left_sidebar;};