Rename Context.preview to Context.logo to leave a space for previews

14 files changed, 247 insertions, 292 deletions

diff --git a/doc/objects.dia b/doc/objects.dia
index 11710bc..f232524 100644
--- a/doc/objects.dia
+++ b/doc/objects.dia
@@ -2,10 +2,10 @@
 <dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
   <dia:diagramdata>
     <dia:attribute name="background">
-      <dia:color val="#ffffffff"/>
+      <dia:color val="#ffffff"/>
     </dia:attribute>
     <dia:attribute name="pagebreak">
-      <dia:color val="#000099ff"/>
+      <dia:color val="#000099"/>
     </dia:attribute>
     <dia:attribute name="paper">
       <dia:composite type="paper">
@@ -37,9 +37,6 @@
     </dia:attribute>
     <dia:attribute name="grid">
       <dia:composite type="grid">
-        <dia:attribute name="dynamic">
-          <dia:boolean val="true"/>
-        </dia:attribute>
         <dia:attribute name="width_x">
           <dia:real val="0.40000000000000002"/>
         </dia:attribute>
@@ -56,7 +53,7 @@
       </dia:composite>
     </dia:attribute>
     <dia:attribute name="color">
-      <dia:color val="#d8e5e5ff"/>
+      <dia:color val="#d8e5e5"/>
     </dia:attribute>
     <dia:attribute name="guides">
       <dia:composite type="guides">
@@ -64,51 +61,9 @@
         <dia:attribute name="vguides"/>
       </dia:composite>
     </dia:attribute>
-    <dia:attribute name="display">
-      <dia:composite type="display">
-        <dia:attribute name="antialiased">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="snap-to-grid">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="snap-to-object">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="show-grid">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="show-connection-points">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-      </dia:composite>
-    </dia:attribute>
   </dia:diagramdata>
   <dia:layer name="Background" visible="true" active="true">
     <dia:object type="UML - Association" version="2" id="O0">
-      <dia:attribute name="obj_pos">
-        <dia:point val="13.4797,53.5632"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.905,52.8032;13.5297,56.84"/>
-      </dia:attribute>
-      <dia:attribute name="meta">
-        <dia:composite type="dict"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="13.4797,53.5632"/>
-        <dia:point val="11,53.5632"/>
-        <dia:point val="11,56"/>
-        <dia:point val="9.955,56"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
-      </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
@@ -145,41 +100,20 @@
       <dia:attribute name="show_arrow_b">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="text_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="text_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="text_colour">
-        <dia:color val="#000000ff"/>
-      </dia:attribute>
-      <dia:attribute name="line_width">
-        <dia:real val="0.10000000000000001"/>
-      </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O20" connection="6"/>
-        <dia:connection handle="1" to="O7" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="2" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="30,26.3"/>
+        <dia:point val="17.9078,53.8661"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.4297,25.54;30.05,32.8032"/>
+        <dia:rectangle val="17.8578,53.0661;18.9689,56.4464"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30,26.3"/>
-        <dia:point val="15,26.3"/>
-        <dia:point val="15,31.9632"/>
-        <dia:point val="13.4797,31.9632"/>
+        <dia:point val="17.9078,53.8661"/>
+        <dia:point val="18.8689,53.8661"/>
+        <dia:point val="18.8689,55.6464"/>
+        <dia:point val="18.016,55.6464"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -189,6 +123,18 @@
       <dia:attribute name="orth_autoroute">
         <dia:boolean val="false"/>
       </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O20" connection="6"/>
+        <dia:connection handle="1" to="O7" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="2" id="O1">
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
@@ -225,20 +171,34 @@
       <dia:attribute name="show_arrow_b">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="text_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
+      <dia:attribute name="obj_pos">
+        <dia:point val="30,26.3"/>
       </dia:attribute>
-      <dia:attribute name="text_height">
-        <dia:real val="0.80000000000000004"/>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="17.3228,25.5;30.05,31.0661"/>
       </dia:attribute>
-      <dia:attribute name="text_colour">
-        <dia:color val="#000000ff"/>
+      <dia:attribute name="meta">
+        <dia:composite type="dict"/>
       </dia:attribute>
-      <dia:attribute name="line_width">
-        <dia:real val="0.10000000000000001"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="30,26.3"/>
+        <dia:point val="17.879,26.3"/>
+        <dia:point val="17.879,30.2661"/>
+        <dia:point val="17.9078,30.2661"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O2" connection="22"/>
@@ -250,16 +210,16 @@
         <dia:point val="30,8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.985,7.985;49.405,35.615"/>
+        <dia:rectangle val="29.985,7.985;49.4425,37.615"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="30,8"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="19.390000000000001"/>
+        <dia:real val="19.427499999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="27.600000000000001"/>
+        <dia:real val="29.600000000000001"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Context#</dia:string>
@@ -300,20 +260,17 @@
       <dia:attribute name="comment_tagging">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="allow_resizing">
-        <dia:boolean val="false"/>
-      </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.029999999999999999"/>
       </dia:attribute>
       <dia:attribute name="line_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_color">
-        <dia:color val="#c1ccccff"/>
+        <dia:color val="#c1cccc"/>
       </dia:attribute>
       <dia:attribute name="text_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="normal_font">
         <dia:font family="monospace" style="0" name="Courier"/>
@@ -501,7 +458,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Icon, in PNG or SVG format, to represent the Context#</dia:string>
+            <dia:string>#Icon in PNG and 55x55 size#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -538,7 +495,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#preview#</dia:string>
+            <dia:string>#logo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#blob [R WA]#</dia:string>
@@ -547,7 +504,30 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Screenshot in PNG#</dia:string>
+            <dia:string>#Logo in PNG and 140x140 size#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#previews#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#[blob] [R WA]#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#List of screenshot in PNG and arbitrary sizes#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -667,20 +647,17 @@
       <dia:attribute name="comment_tagging">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="allow_resizing">
-        <dia:boolean val="false"/>
-      </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.029999999999999999"/>
       </dia:attribute>
       <dia:attribute name="line_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_color">
-        <dia:color val="#90ee90ff"/>
+        <dia:color val="#90ee90"/>
       </dia:attribute>
       <dia:attribute name="text_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="normal_font">
         <dia:font family="monospace" style="0" name="Courier"/>
@@ -873,20 +850,17 @@
       <dia:attribute name="comment_tagging">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="allow_resizing">
-        <dia:boolean val="false"/>
-      </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.029999999999999999"/>
       </dia:attribute>
       <dia:attribute name="line_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_color">
-        <dia:color val="#ffffffff"/>
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       <dia:attribute name="text_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="normal_font">
         <dia:font family="monospace" style="0" name="Courier"/>
@@ -1071,29 +1045,6 @@
       <dia:attribute name="templates"/>
     </dia:object>
     <dia:object type="UML - Association" version="2" id="O5">
-      <dia:attribute name="obj_pos">
-        <dia:point val="49.39,26.3"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="49.34,25.54;61.1,32.3713"/>
-      </dia:attribute>
-      <dia:attribute name="meta">
-        <dia:composite type="dict"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="49.39,26.3"/>
-        <dia:point val="61,26.3"/>
-        <dia:point val="61,31.5313"/>
-        <dia:point val="60.2393,31.5313"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
-      </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
@@ -1130,20 +1081,34 @@
       <dia:attribute name="show_arrow_b">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="text_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
+      <dia:attribute name="obj_pos">
+        <dia:point val="49.4275,26.3"/>
       </dia:attribute>
-      <dia:attribute name="text_height">
-        <dia:real val="0.80000000000000004"/>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="49.3775,25.5;62.2385,31.0585"/>
       </dia:attribute>
-      <dia:attribute name="text_colour">
-        <dia:color val="#000000ff"/>
+      <dia:attribute name="meta">
+        <dia:composite type="dict"/>
       </dia:attribute>
-      <dia:attribute name="line_width">
-        <dia:real val="0.10000000000000001"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="49.4275,26.3"/>
+        <dia:point val="61.7373,26.3"/>
+        <dia:point val="61.7373,30.2585"/>
+        <dia:point val="61.6535,30.2585"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O2" connection="23"/>
@@ -1152,13 +1117,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="53.8293,31.5313"/>
+        <dia:point val="55.2435,30.2585"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="53.8143,31.5163;66.6643,66.7463"/>
+        <dia:rectangle val="55.2285,30.2435;68.0785,65.4735"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="53.8293,31.5313"/>
+        <dia:point val="55.2435,30.2585"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.82"/>
@@ -1205,20 +1170,17 @@
       <dia:attribute name="comment_tagging">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="allow_resizing">
-        <dia:boolean val="false"/>
-      </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.029999999999999999"/>
       </dia:attribute>
       <dia:attribute name="line_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_color">
-        <dia:color val="#d8e5e5ff"/>
+        <dia:color val="#d8e5e5"/>
       </dia:attribute>
       <dia:attribute name="text_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="normal_font">
         <dia:font family="monospace" style="0" name="Courier"/>
@@ -1542,19 +1504,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="4,56"/>
+        <dia:point val="12.061,55.6464"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.985,55.985;15.925,71.215"/>
+        <dia:rectangle val="12.046,55.6314;23.986,70.8614"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="4,56"/>
+        <dia:point val="12.061,55.6464"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.91"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="15.200000000000003"/>
+        <dia:real val="15.200000000000001"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Report#</dia:string>
@@ -1595,20 +1557,17 @@
       <dia:attribute name="comment_tagging">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="allow_resizing">
-        <dia:boolean val="false"/>
-      </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.029999999999999999"/>
       </dia:attribute>
       <dia:attribute name="line_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_color">
-        <dia:color val="#d8e5e5ff"/>
+        <dia:color val="#d8e5e5"/>
       </dia:attribute>
       <dia:attribute name="text_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="normal_font">
         <dia:font family="monospace" style="0" name="Courier"/>
@@ -1747,7 +1706,6 @@
       <dia:attribute name="templates"/>
     </dia:object>
     <dia:group>
-      <dia:attribute name="matrix"/>
       <dia:object type="Standard - Box" version="0" id="O8">
         <dia:attribute name="obj_pos">
           <dia:point val="62,8"/>
@@ -1768,7 +1726,7 @@
           <dia:real val="0.0010583332689479003"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#ffffccff"/>
+          <dia:color val="#ffffcc"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
@@ -1782,7 +1740,7 @@
           <dia:point val="63,9.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,8.705;71.67,9.45"/>
+          <dia:rectangle val="63,8.705;71.67,9.4525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1799,7 +1757,7 @@
               <dia:point val="63,9.3"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -1815,7 +1773,7 @@
           <dia:point val="63,12.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,11.705;79.725,12.45"/>
+          <dia:rectangle val="63,11.705;79.725,12.4525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1832,7 +1790,7 @@
               <dia:point val="63,12.3"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -1848,7 +1806,7 @@
           <dia:point val="63,13.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,12.705;81.39,13.45"/>
+          <dia:rectangle val="63,12.705;81.39,13.4525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1865,7 +1823,7 @@
               <dia:point val="63,13.3"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -1881,7 +1839,7 @@
           <dia:point val="63,11.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,10.705;76.6375,11.45"/>
+          <dia:rectangle val="63,10.705;76.6375,11.4525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1898,7 +1856,7 @@
               <dia:point val="63,11.3"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -1914,7 +1872,7 @@
           <dia:point val="63,14.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,13.705;80.82,14.45"/>
+          <dia:rectangle val="63,13.705;80.82,14.4525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1931,7 +1889,7 @@
               <dia:point val="63,14.3"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -1947,7 +1905,7 @@
           <dia:point val="63,10.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,9.705;74.7525,10.45"/>
+          <dia:rectangle val="63,9.705;74.7525,10.4525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1964,7 +1922,7 @@
               <dia:point val="63,10.3"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -1980,7 +1938,7 @@
           <dia:point val="63,18.5"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,17.905;80.41,18.65"/>
+          <dia:rectangle val="63,17.905;80.41,18.6525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1997,7 +1955,7 @@
               <dia:point val="63,18.5"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -2013,7 +1971,7 @@
           <dia:point val="63,15.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,14.705;76.82,15.45"/>
+          <dia:rectangle val="63,14.705;76.82,15.4525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -2030,7 +1988,7 @@
               <dia:point val="63,15.3"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -2046,7 +2004,7 @@
           <dia:point val="63,16.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,15.705;82.6725,16.45"/>
+          <dia:rectangle val="63,15.705;82.6725,16.4525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -2063,7 +2021,7 @@
               <dia:point val="63,16.3"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -2079,7 +2037,7 @@
           <dia:point val="62,7"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,6.405;84.375,7.15"/>
+          <dia:rectangle val="62,6.405;84.375,7.1525"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -2096,7 +2054,7 @@
               <dia:point val="62,7"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -2112,7 +2070,7 @@
           <dia:point val="63,17.1414"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="63,16.5464;73.7075,17.2914"/>
+          <dia:rectangle val="63,16.5464;73.7075,17.2939"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -2129,7 +2087,7 @@
               <dia:point val="63,17.1414"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000ff"/>
+              <dia:color val="#000000"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="0"/>
@@ -2143,19 +2101,19 @@
     </dia:group>
     <dia:object type="UML - Class" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.717157,31.9632"/>
+        <dia:point val="12.1016,30.2661"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.702157,31.9482;26.2572,53.5782"/>
+        <dia:rectangle val="12.0866,30.2511;23.7291,53.8811"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="0.717157,31.9632"/>
+        <dia:point val="12.1016,30.2661"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="25.524999999999999"/>
+        <dia:real val="11.612500000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="21.600000000000005"/>
+        <dia:real val="23.600000000000005"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Release#</dia:string>
@@ -2196,20 +2154,17 @@
       <dia:attribute name="comment_tagging">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="allow_resizing">
-        <dia:boolean val="false"/>
-      </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.029999999999999999"/>
       </dia:attribute>
       <dia:attribute name="line_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_color">
-        <dia:color val="#d8e5e5ff"/>
+        <dia:color val="#d8e5e5"/>
       </dia:attribute>
       <dia:attribute name="text_color">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="normal_font">
         <dia:font family="monospace" style="0" name="Courier"/>
@@ -2371,10 +2326,10 @@
             <dia:string>#[str] [R]#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>#List of dependencies; see Wiki for details#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#List of dependencies; see Wiki for details#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
diff --git a/sugar_network/client/releases.py b/sugar_network/client/releases.py
index 98b14b2..ff35d16 100644
--- a/sugar_network/client/releases.py
+++ b/sugar_network/client/releases.py
@@ -155,7 +155,7 @@ class Routes(object):
         if not contexts.exists(guid):
             context = self._call(method='GET', path=['context', guid])
             contexts.create(context, setters=True)
-            for prop in ('icon', 'artifact_icon', 'preview'):
+            for prop in ('icon', 'artifact_icon', 'logo'):
                 blob = self._call(method='GET', path=['context', guid, prop])
                 if blob is not None:
                     contexts.update(guid, {prop: {'blob': blob}})
diff --git a/sugar_network/model/context.py b/sugar_network/model/context.py
index 85d9be8..1763d65 100644
--- a/sugar_network/model/context.py
+++ b/sugar_network/model/context.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013 Aleksey Lim
+# Copyright (C) 2012-2014 Aleksey Lim
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -95,19 +95,19 @@ class Context(db.Resource):
                 })
 
     @db.blob_property(mime_type='image/png')
-    def preview(self, value):
+    def logo(self, value):
         if value:
             return value
         if 'package' in self['type']:
             return Blob({
-                'url': '/static/images/package-preview.png',
-                'blob': static.path('images', 'package-preview.png'),
+                'url': '/static/images/package-logo.png',
+                'blob': static.path('images', 'package-logo.png'),
                 'mime_type': 'image/png',
                 })
         else:
             return Blob({
-                'url': '/static/images/missing-preview.png',
-                'blob': static.path('images', 'missing-preview.png'),
+                'url': '/static/images/missing-logo.png',
+                'blob': static.path('images', 'missing-.png'),
                 'mime_type': 'image/png',
                 })
 
@@ -159,4 +159,4 @@ class Context(db.Resource):
                 'digest': hashlib.sha1(svg).hexdigest(),
                 }
         props['icon'] = convert(55, 55)
-        props['preview'] = convert(140, 140)
+        props['logo'] = convert(140, 140)
diff --git a/sugar_network/model/post.py b/sugar_network/model/post.py
index fda366f..88c6956 100644
--- a/sugar_network/model/post.py
+++ b/sugar_network/model/post.py
@@ -71,8 +71,8 @@ class Post(db.Resource):
         if value:
             return value
         return Blob({
-            'url': '/static/images/missing-preview.png',
-            'blob': static.path('images', 'missing-preview.png'),
+            'url': '/static/images/missing-logo.png',
+            'blob': static.path('images', 'missing-logo.png'),
             'mime_type': 'image/png',
             })
 
diff --git a/sugar_network/static/httpdocs/images/missing-preview.png b/sugar_network/static/httpdocs/images/missing-logo.png
index 98be121..98be121 100644
--- a/sugar_network/static/httpdocs/images/missing-preview.png
+++ b/sugar_network/static/httpdocs/images/missing-logo.png
diff --git a/sugar_network/static/httpdocs/images/package-preview.png b/sugar_network/static/httpdocs/images/package-logo.png
index c6cf086..c6cf086 100644
--- a/sugar_network/static/httpdocs/images/package-preview.png
+++ b/sugar_network/static/httpdocs/images/package-logo.png
diff --git a/tests/integration/master_personal.py b/tests/integration/master_personal.py
index 82c66b2..ec87942 100755
--- a/tests/integration/master_personal.py
+++ b/tests/integration/master_personal.py
@@ -78,7 +78,7 @@ class MasterPersonalTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview1',
+            'logo': 'logo1',
             'layer': 'pilot',
             })
         guid_2 = master.post(['context'], {
@@ -87,7 +87,7 @@ class MasterPersonalTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview2',
+            'logo': 'logo2',
             'layer': 'pilot',
             })
 
@@ -98,7 +98,7 @@ class MasterPersonalTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview3',
+            'logo': 'logo3',
             'layer': 'pilot',
             })
         guid_4 = client.post(['context'], {
@@ -107,7 +107,7 @@ class MasterPersonalTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview4',
+            'logo': 'logo4',
             'layer': 'pilot',
             })
         stats_timestamp = int(time.time())
@@ -134,11 +134,11 @@ class MasterPersonalTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview5',
+            'logo': 'logo5',
             'layer': 'pilot',
             })
         master.put(['context', guid_1, 'title'], 'title_1_')
-        master.put(['context', guid_3, 'preview'], 'preview3_')
+        master.put(['context', guid_3, 'logo'], 'logo3_')
 
         # Update data on client
         guid_6 = client.post(['context'], {
@@ -147,11 +147,11 @@ class MasterPersonalTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview6',
+            'logo': 'logo6',
             'layer': 'pilot',
             })
         client.put(['context', guid_3, 'title'], 'title_3_')
-        client.put(['context', guid_1, 'preview'], 'preview1_')
+        client.put(['context', guid_1, 'logo'], 'logo1_')
 
         # Export client changes
         trigger = self.wait_for_events(client, event='sync_complete')
@@ -186,18 +186,18 @@ class MasterPersonalTest(tests.Test):
                     ]},
                 client.get(['context'], reply=['guid', 'title'], layer='pilot'))
 
-        self.assertEqual('preview1_', master.request('GET', ['context', guid_1, 'preview']).content)
-        self.assertEqual('preview2', master.request('GET', ['context', guid_2, 'preview']).content)
-        self.assertEqual('preview3_', master.request('GET', ['context', guid_3, 'preview']).content)
-        self.assertEqual('preview4', master.request('GET', ['context', guid_4, 'preview']).content)
-        self.assertEqual('preview5', master.request('GET', ['context', guid_5, 'preview']).content)
-        self.assertEqual('preview6', master.request('GET', ['context', guid_6, 'preview']).content)
-        self.assertEqual('preview1_', client.request('GET', ['context', guid_1, 'preview']).content)
-        self.assertEqual('preview2', client.request('GET', ['context', guid_2, 'preview']).content)
-        self.assertEqual('preview3_', client.request('GET', ['context', guid_3, 'preview']).content)
-        self.assertEqual('preview4', client.request('GET', ['context', guid_4, 'preview']).content)
-        self.assertEqual('preview5', client.request('GET', ['context', guid_5, 'preview']).content)
-        self.assertEqual('preview6', client.request('GET', ['context', guid_6, 'preview']).content)
+        self.assertEqual('logo1_', master.request('GET', ['context', guid_1, 'logo']).content)
+        self.assertEqual('logo2', master.request('GET', ['context', guid_2,  'logo']).content)
+        self.assertEqual('logo3_', master.request('GET', ['context', guid_3, 'logo']).content)
+        self.assertEqual('logo4', master.request('GET', ['context', guid_4,  'logo']).content)
+        self.assertEqual('logo5', master.request('GET', ['context', guid_5,  'logo']).content)
+        self.assertEqual('logo6', master.request('GET', ['context', guid_6,  'logo']).content)
+        self.assertEqual('logo1_', client.request('GET', ['context', guid_1, 'logo']).content)
+        self.assertEqual('logo2', client.request('GET', ['context', guid_2,  'logo']).content)
+        self.assertEqual('logo3_', client.request('GET', ['context', guid_3, 'logo']).content)
+        self.assertEqual('logo4', client.request('GET', ['context', guid_4,  'logo']).content)
+        self.assertEqual('logo5', client.request('GET', ['context', guid_5,  'logo']).content)
+        self.assertEqual('logo6', client.request('GET', ['context', guid_6,  'logo']).content)
 
         self.assertEqual('1', file('master/files/1/1').read())
         self.assertEqual('2', file('master/files/2/2').read())
diff --git a/tests/integration/master_slave.py b/tests/integration/master_slave.py
index 9a870e3..0bf9f4f 100755
--- a/tests/integration/master_slave.py
+++ b/tests/integration/master_slave.py
@@ -66,7 +66,7 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview1',
+            'logo': 'logo1',
             'layer': 'pilot',
             })
         self.touch(('master/files/file1', 'file1'))
@@ -77,7 +77,7 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview2',
+            'logo': 'logo2',
             'layer': 'pilot',
             })
         slave.post(['user', tests.UID], {
@@ -89,9 +89,9 @@ class MasterSlaveTest(tests.Test):
         slave.post(cmd='online-sync')
 
         self.assertEqual('title1', master.get(['context', context1, 'title']))
-        self.assertEqual('preview1', master.request('GET', ['context', context1, 'preview']).content)
+        self.assertEqual('logo1', master.request('GET', ['context', context1, 'logo']).content)
         self.assertEqual('title2', master.get(['context', context2, 'title']))
-        self.assertEqual('preview2', master.request('GET', ['context', context2, 'preview']).content)
+        self.assertEqual('logo2', master.request('GET', ['context', context2, 'logo']).content)
 
         stats = Rrd('master/stats/user/%s/%s' % (tests.UID[:2], tests.UID), 1)
         self.assertEqual([
@@ -118,11 +118,11 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview3',
+            'logo': 'logo3',
             'layer': 'pilot',
             })
         master.put(['context', context1, 'title'], 'title1_')
-        master.put(['context', context2, 'preview'], 'preview2_')
+        master.put(['context', context2, 'logo'], 'logo2_')
         self.touch(('master/files/file1', 'file1_'))
         self.touch(('master/files/file2', 'file2'))
 
@@ -132,11 +132,11 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview4',
+            'logo': 'logo4',
             'layer': 'pilot',
             })
         slave.put(['context', context2, 'title'], 'title2_')
-        slave.put(['context', context1, 'preview'], 'preview1_')
+        slave.put(['context', context1, 'logo'], 'logo1_')
         slave.post(['user', tests.UID], {
             'name': 'db',
             'values': [(ts + 1, {'field': 2})],
@@ -146,13 +146,13 @@ class MasterSlaveTest(tests.Test):
         slave.post(cmd='online-sync')
 
         self.assertEqual('title1_', master.get(['context', context1, 'title']))
-        self.assertEqual('preview1_', master.request('GET', ['context', context1, 'preview']).content)
+        self.assertEqual('logo1_', master.request('GET', ['context', context1, 'logo']).content)
         self.assertEqual('title2_', master.get(['context', context2, 'title']))
-        self.assertEqual('preview2_', master.request('GET', ['context', context2, 'preview']).content)
+        self.assertEqual('logo2_', master.request('GET', ['context', context2, 'logo']).content)
         self.assertEqual('title3', master.get(['context', context3, 'title']))
-        self.assertEqual('preview3', master.request('GET', ['context', context3, 'preview']).content)
+        self.assertEqual('logo3', master.request('GET', ['context', context3, 'logo']).content)
         self.assertEqual('title4', master.get(['context', context4, 'title']))
-        self.assertEqual('preview3', master.request('GET', ['context', context3, 'preview']).content)
+        self.assertEqual('logo3', master.request('GET', ['context', context3, 'logo']).content)
         stats = Rrd('master/stats/user/%s/%s' % (tests.UID[:2], tests.UID), 1)
         self.assertEqual([
             [('db', ts, {'field': 1.0}), ('db', ts + 1, {'field': 2.0})]
@@ -162,13 +162,13 @@ class MasterSlaveTest(tests.Test):
         self.assertEqual('file2', file('master/files/file2').read())
 
         self.assertEqual('title1_', slave.get(['context', context1, 'title']))
-        self.assertEqual('preview1_', slave.request('GET', ['context', context1, 'preview']).content)
+        self.assertEqual('logo1_', slave.request('GET', ['context', context1, 'logo']).content)
         self.assertEqual('title2_', slave.get(['context', context2, 'title']))
-        self.assertEqual('preview2_', slave.request('GET', ['context', context2, 'preview']).content)
+        self.assertEqual('logo2_', slave.request('GET', ['context', context2, 'logo']).content)
         self.assertEqual('title3', slave.get(['context', context3, 'title']))
-        self.assertEqual('preview3', slave.request('GET', ['context', context3, 'preview']).content)
+        self.assertEqual('logo3', slave.request('GET', ['context', context3, 'logo']).content)
         self.assertEqual('title4', slave.get(['context', context4, 'title']))
-        self.assertEqual('preview4', slave.request('GET', ['context', context4, 'preview']).content)
+        self.assertEqual('logo4', slave.request('GET', ['context', context4, 'logo']).content)
         stats = Rrd('slave/stats/user/%s/%s' % (tests.UID[:2], tests.UID), 1)
         self.assertEqual([
             [('db', ts, {'field': 1.0}), ('db', ts + 1, {'field': 2.0})]
@@ -192,7 +192,7 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview1',
+            'logo': 'logo1',
             'layer': 'pilot',
             })
         guid_2 = master.post(['context'], {
@@ -201,7 +201,7 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview2',
+            'logo': 'logo2',
             'layer': 'pilot',
             })
 
@@ -212,7 +212,7 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview3',
+            'logo': 'logo3',
             'layer': 'pilot',
             })
         guid_4 = slave.post(['context'], {
@@ -221,7 +221,7 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview4',
+            'logo': 'logo4',
             'layer': 'pilot',
             })
         stats_timestamp = int(time.time())
@@ -246,11 +246,11 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview5',
+            'logo': 'logo5',
             'layer': 'pilot',
             })
         master.put(['context', guid_1, 'title'], 'title_1_')
-        master.put(['context', guid_3, 'preview'], 'preview3_')
+        master.put(['context', guid_3, 'logo'], 'logo3_')
 
         # Update data on slave
         guid_6 = slave.post(['context'], {
@@ -259,11 +259,11 @@ class MasterSlaveTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             'artifact_icon': 'artifact_icon',
-            'preview': 'preview6',
+            'logo': 'logo6',
             'layer': 'pilot',
             })
         slave.put(['context', guid_3, 'title'], 'title_3_')
-        slave.put(['context', guid_1, 'preview'], 'preview1_')
+        slave.put(['context', guid_1, 'logo'], 'logo1_')
 
         # Export slave changes
         slave.post(cmd='offline-sync', path=tests.tmpdir + '/sync2/sugar-network-sync')
@@ -294,18 +294,18 @@ class MasterSlaveTest(tests.Test):
                     ]},
                 slave.get(['context'], reply=['guid', 'title'], layer='pilot'))
 
-        self.assertEqual('preview1_', master.request('GET', ['context', guid_1, 'preview']).content)
-        self.assertEqual('preview2', master.request('GET', ['context', guid_2, 'preview']).content)
-        self.assertEqual('preview3_', master.request('GET', ['context', guid_3, 'preview']).content)
-        self.assertEqual('preview4', master.request('GET', ['context', guid_4, 'preview']).content)
-        self.assertEqual('preview5', master.request('GET', ['context', guid_5, 'preview']).content)
-        self.assertEqual('preview6', master.request('GET', ['context', guid_6, 'preview']).content)
-        self.assertEqual('preview1_', slave.request('GET', ['context', guid_1, 'preview']).content)
-        self.assertEqual('preview2', slave.request('GET', ['context', guid_2, 'preview']).content)
-        self.assertEqual('preview3_', slave.request('GET', ['context', guid_3, 'preview']).content)
-        self.assertEqual('preview4', slave.request('GET', ['context', guid_4, 'preview']).content)
-        self.assertEqual('preview5', slave.request('GET', ['context', guid_5, 'preview']).content)
-        self.assertEqual('preview6', slave.request('GET', ['context', guid_6, 'preview']).content)
+        self.assertEqual('logo1_', master.request('GET', ['context', guid_1, 'logo']).content)
+        self.assertEqual('logo2', master.request('GET', ['context', guid_2,  'logo']).content)
+        self.assertEqual('logo3_', master.request('GET', ['context', guid_3, 'logo']).content)
+        self.assertEqual('logo4', master.request('GET', ['context', guid_4,  'logo']).content)
+        self.assertEqual('logo5', master.request('GET', ['context', guid_5,  'logo']).content)
+        self.assertEqual('logo6', master.request('GET', ['context', guid_6,  'logo']).content)
+        self.assertEqual('logo1_', slave.request('GET', ['context', guid_1,  'logo']).content)
+        self.assertEqual('logo2', slave.request('GET', ['context', guid_2,   'logo']).content)
+        self.assertEqual('logo3_', slave.request('GET', ['context', guid_3,  'logo']).content)
+        self.assertEqual('logo4', slave.request('GET', ['context', guid_4,   'logo']).content)
+        self.assertEqual('logo5', slave.request('GET', ['context', guid_5,   'logo']).content)
+        self.assertEqual('logo6', slave.request('GET', ['context', guid_6,   'logo']).content)
 
         self.assertEqual('1', file('master/files/1/1').read())
         self.assertEqual('2', file('master/files/2/2').read())
diff --git a/tests/integration/node_packages.py b/tests/integration/node_packages.py
index f4bae67..91b6f16 100755
--- a/tests/integration/node_packages.py
+++ b/tests/integration/node_packages.py
@@ -83,7 +83,7 @@ class NodePackagesSlaveTest(tests.Test):
             'title': 'title',
             'summary': 'summary',
             'description': 'description',
-            'preview': 'preview',
+            'logo': 'logo',
             'layer': 'pilot',
             'type': 'package',
             'aliases': {'Fedora': {'binary': [['package']]}},
diff --git a/tests/units/client/offline_routes.py b/tests/units/client/offline_routes.py
index a0d5045..b14ccd6 100755
--- a/tests/units/client/offline_routes.py
+++ b/tests/units/client/offline_routes.py
@@ -146,30 +146,30 @@ class OfflineRoutes(tests.Test):
             'summary': 'summary',
             'description': 'description',
             })
-        blob = 'preview_blob'
-        ipc.request('PUT', ['context', guid, 'preview'], blob)
+        blob = 'logo_blob'
+        ipc.request('PUT', ['context', guid, 'logo'], blob)
 
         self.assertEqual(
                 blob,
-                ipc.request('GET', ['context', guid, 'preview']).content)
+                ipc.request('GET', ['context', guid, 'logo']).content)
         self.assertEqual({
-            'preview': {
-                'url': 'http://127.0.0.1:5555/context/%s/preview' % guid,
+            'logo': {
+                'url': 'http://127.0.0.1:5555/context/%s/logo' % guid,
                 'blob_size': len(blob),
                 'digest': hashlib.sha1(blob).hexdigest(),
                 'mime_type': 'image/png',
                 },
             },
-            ipc.get(['context', guid], reply=['preview']))
+            ipc.get(['context', guid], reply=['logo']))
         self.assertEqual([{
-            'preview': {
-                'url': 'http://127.0.0.1:5555/context/%s/preview' % guid,
+            'logo': {
+                'url': 'http://127.0.0.1:5555/context/%s/logo' % guid,
                 'blob_size': len(blob),
                 'digest': hashlib.sha1(blob).hexdigest(),
                 'mime_type': 'image/png',
                 },
             }],
-            ipc.get(['context'], reply=['preview'])['result'])
+            ipc.get(['context'], reply=['logo'])['result'])
 
         self.assertEqual(
                 file(src_root + '/sugar_network/static/httpdocs/images/package.png').read(),
diff --git a/tests/units/client/online_routes.py b/tests/units/client/online_routes.py
index 1d1b780..cf14834 100755
--- a/tests/units/client/online_routes.py
+++ b/tests/units/client/online_routes.py
@@ -233,30 +233,30 @@ class OnlineRoutes(tests.Test):
             'summary': 'summary',
             'description': 'description',
             })
-        blob = 'preview_blob'
-        ipc.request('PUT', ['context', guid, 'preview'], blob, headers={'content-type': 'image/png'})
+        blob = 'logo_blob'
+        ipc.request('PUT', ['context', guid, 'logo'], blob, headers={'content-type': 'image/png'})
 
         self.assertEqual(
                 blob,
-                ipc.request('GET', ['context', guid, 'preview']).content)
+                ipc.request('GET', ['context', guid, 'logo']).content)
         self.assertEqual({
-            'preview': {
-                'url': 'http://127.0.0.1:8888/context/%s/preview' % guid,
+            'logo': {
+                'url': 'http://127.0.0.1:8888/context/%s/logo' % guid,
                 'blob_size': len(blob),
                 'digest': hashlib.sha1(blob).hexdigest(),
                 'mime_type': 'image/png',
                 },
             },
-            ipc.get(['context', guid], reply=['preview']))
+            ipc.get(['context', guid], reply=['logo']))
         self.assertEqual([{
-            'preview': {
-                'url': 'http://127.0.0.1:8888/context/%s/preview' % guid,
+            'logo': {
+                'url': 'http://127.0.0.1:8888/context/%s/logo' % guid,
                 'blob_size': len(blob),
                 'digest': hashlib.sha1(blob).hexdigest(),
                 'mime_type': 'image/png',
                 },
             }],
-            ipc.get(['context'], reply=['preview'])['result'])
+            ipc.get(['context'], reply=['logo'])['result'])
 
         self.assertEqual(
                 file(src_root + '/sugar_network/static/httpdocs/images/package.png').read(),
diff --git a/tests/units/client/server_routes.py b/tests/units/client/server_routes.py
index 6bbb955..8c72468 100755
--- a/tests/units/client/server_routes.py
+++ b/tests/units/client/server_routes.py
@@ -130,30 +130,30 @@ class ServerRoutesTest(tests.Test):
             'summary': 'summary',
             'description': 'description',
             })
-        blob = 'preview_blob'
-        ipc.request('PUT', ['context', guid, 'preview'], blob)
+        blob = 'logo_blob'
+        ipc.request('PUT', ['context', guid, 'logo'], blob)
 
         self.assertEqual(
                 blob,
-                ipc.request('GET', ['context', guid, 'preview']).content)
+                ipc.request('GET', ['context', guid, 'logo']).content)
         self.assertEqual({
-            'preview': {
-                'url': 'http://127.0.0.1:5555/context/%s/preview' % guid,
+            'logo': {
+                'url': 'http://127.0.0.1:5555/context/%s/logo' % guid,
                 'blob_size': len(blob),
                 'digest': hashlib.sha1(blob).hexdigest(),
                 'mime_type': 'image/png',
                 },
             },
-            ipc.get(['context', guid], reply=['preview']))
+            ipc.get(['context', guid], reply=['logo']))
         self.assertEqual([{
-            'preview': {
-                'url': 'http://127.0.0.1:5555/context/%s/preview' % guid,
+            'logo': {
+                'url': 'http://127.0.0.1:5555/context/%s/logo' % guid,
                 'blob_size': len(blob),
                 'digest': hashlib.sha1(blob).hexdigest(),
                 'mime_type': 'image/png',
                 },
             }],
-            ipc.get(['context'], reply=['preview'])['result'])
+            ipc.get(['context'], reply=['logo'])['result'])
 
         self.assertEqual(
                 file(src_root + '/sugar_network/static/httpdocs/images/package.png').read(),
diff --git a/tests/units/model/context.py b/tests/units/model/context.py
index f2de64d..3389f41 100755
--- a/tests/units/model/context.py
+++ b/tests/units/model/context.py
@@ -57,7 +57,7 @@ class ContextTest(tests.Test):
             })
         assert exists('master/context/gu/guid/artifact_icon.blob')
         assert exists('master/context/gu/guid/icon.blob')
-        assert exists('master/context/gu/guid/preview.blob')
+        assert exists('master/context/gu/guid/logo.blob')
 
     def test_RatingSort(self):
         directory = db.Volume('db', [Context])['context']
diff --git a/tests/units/node/node.py b/tests/units/node/node.py
index 9ad5726..d8f00ec 100755
--- a/tests/units/node/node.py
+++ b/tests/units/node/node.py
@@ -869,7 +869,7 @@ class NodeTest(tests.Test):
             context['description'])
         self.assertEqual(svg, file(context['artifact_icon']['blob']).read())
         assert 'blob' in context['icon']
-        assert 'blob' in context['preview']
+        assert 'blob' in context['logo']
         self.assertEqual('http://wiki.sugarlabs.org/go/Activities/Image_Viewer', context['homepage'])
         self.assertEqual(['image/bmp', 'image/gif'], context['mime_types'])