@@ -24,7 +24,7 @@ import Unity.Indicators 0.1 as Indicators
2424Indicators.IndicatorBase {
2525 id: indicatorWidget
2626
27− property int iconSize: height
27+ property int iconSize: units.gu(2)
2828 property alias leftLabel: itemLeftLabel.text
2929 property alias rightLabel: itemRightLabel.text
3030 property var icons: undefined
@@ -34,7 +34,6 @@ Indicators.IndicatorBase {
3434
3535 Row {
3636 id: itemRow
37− width: childrenRect.width
3837 objectName: "itemRow"
3938 anchors {
4039 top: parent.top
@@ -55,7 +54,6 @@ Indicators.IndicatorBase {
5554 }
5655
5756 Row {
58− width: childrenRect.width
5957 anchors {
6058 top: parent.top
6159 bottom: parent.bottom
@@ -65,22 +63,20 @@ Indicators.IndicatorBase {
6563 model: indicatorWidget.icons
6664
6765 Item {
68− width: guRoundUp(itemImage.width)
69− height: indicatorWidget.iconSize
66+ width: guRoundUp(itemImage.width) + units.gu(1)
67+ anchors { top: parent.top; bottom: parent.bottom }
7068
71− Image {
69+ Icon {
7270 id: itemImage
7371 objectName: "itemImage"
74− visible: source != ""
75− source: modelData
76− height: parent.height
77− anchors.horizontalCenter: parent.horizontalCenter
78− fillMode: Image.PreserveAspectFit
79−
80− sourceSize {
81− width: indicatorWidget.iconSize
82− height: indicatorWidget.iconSize
83− }
72+ // FIXME: Should be dynamic width, see http://pad.lv/1284235
73+ width: indicatorWidget.iconSize
74+ height: indicatorWidget.iconSize
75+ anchors.centerIn: parent
76+
77+ // FIXME: Icon needs to accept source, see http://pad.lv/1284233
78+ name: modelData.replace("image://theme/", "")
79+ color: "#CCCCCC"
8480 }
8581 }
8682 }