diff --git a/include/display/cfb.h b/include/display/cfb.h
index 69eb82827c6..e8c4772a281 100644
--- a/include/display/cfb.h
+++ b/include/display/cfb.h
@@ -48,9 +48,9 @@ enum cfb_font_caps {
 
 struct cfb_font {
 	const void *data;
+	enum cfb_font_caps caps;
 	u8_t width;
 	u8_t height;
-	enum cfb_font_caps caps;
 	u8_t first_char;
 	u8_t last_char;
 };
@@ -69,10 +69,10 @@ struct cfb_font {
 #define FONT_ENTRY_DEFINE(_name, _width, _height, _caps, _data, _fc, _lc)      \
 	static const Z_STRUCT_SECTION_ITERABLE(cfb_font, _name) =	       \
 	{								       \
+		.data = _data,						       \
+		.caps = _caps,						       \
 		.width = _width,					       \
 		.height = _height,					       \
-		.caps = _caps,						       \
-		.data = _data,						       \
 		.first_char = _fc,					       \
 		.last_char = _lc,					       \
 	}
diff --git a/subsys/fb/cfb.c b/subsys/fb/cfb.c
index 4ad0b10a992..50b9cfa9360 100644
--- a/subsys/fb/cfb.c
+++ b/subsys/fb/cfb.c
@@ -12,8 +12,8 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(cfb);
 
-extern const struct cfb_font __font_entry_start[0];
-extern const struct cfb_font __font_entry_end[0];
+extern const struct cfb_font __font_entry_start[];
+extern const struct cfb_font __font_entry_end[];
 
 struct char_framebuffer {
 	/** Pointer to a buffer in RAM */