@@ -224,19 +224,20 @@ var kTitleLabelCode = 'Label { \n\
224224 horizontalAlignment: root.headerAlignment; \n\
225225 }\n';
226226
227−// %1 is used as extra anchors of emblemImage
228−var kEmblemImageCode = 'Image { \n\
229− id: emblemImage; \n\
230− objectName: "emblemImage"; \n\
227+// %1 is used as extra anchors of emblemIcon
228+// %2 is used as color of emblemIcon
229+var kEmblemIconCode = 'Icon { \n\
230+ id: emblemIcon; \n\
231+ objectName: "emblemIcon"; \n\
231232 anchors { \n\
232233 bottom: titleLabel.baseline; \n\
233234 right: parent.right; \n\
234235 %1
235236 } \n\
236237 source: cardData && cardData["emblem"] || ""; \n\
238+ color: %2; \n\
237239 width: height; \n\
238240 height: status === Image.Ready ? titleLabel.font.pixelSize : 0; \n\
239− fillMode: Image.PreserveAspectFit; \n\
240241 }\n';
241242
242243// %1 is used as anchors of touchdown effect
@@ -267,6 +268,7 @@ var kSubtitleLabelCode = 'Label { \n\
267268 }\n';
268269
269270// %1 is used as anchors of attributesRow
271+// %2 is used as color of attributesRow
270272var kAttributesRowCode = 'CardAttributes { \n\
271273 id: attributesRow; \n\
272274 objectName: "attributesRow"; \n\
@@ -477,8 +479,8 @@ function cardString(template, components) {
477479 }
478480 }
479481 if (hasEmblem) {
480− titleRightAnchor = 'right: emblemImage.left; \n\
481− rightMargin: emblemImage.width > 0 ? units.gu(0.5) : 0; \n';
482+ titleRightAnchor = 'right: emblemIcon.left; \n\
483+ rightMargin: emblemIcon.width > 0 ? units.gu(0.5) : 0; \n';
482484 } else {
483485 titleRightAnchor = 'right: parent.right; \n'
484486 titleRightAnchor += extraRightAnchor;
@@ -552,7 +554,7 @@ function cardString(template, components) {
552554 containerHeight += ' + subtitleLabel.height';
553555 }
554556 if (hasEmblem) {
555− containerCode.push(kEmblemImageCode.arg(extraRightAnchor));
557+ containerCode.push(kEmblemIconCode.arg(extraRightAnchor).arg(titleColor));
556558 }
557559 if (hasAttributes) {
558560 attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(titleColor);
@@ -646,7 +648,7 @@ function cardString(template, components) {
646648
647649function createCardComponent(parent, template, components) {
648650 var imports = 'import QtQuick 2.2; \n\
649− import Ubuntu.Components 0.1; \n\
651+ import Ubuntu.Components 1.1; \n\
650652 import Dash 0.1;\n';
651653 var card = cardString(template, components);
652654 var code = imports + 'Component {\n' + card + '}\n';