10 files changed, 18 insertions, 19 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 744a76b7..1d9e32d5 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -30,13 +30,13 @@ pkgdata_DATA = \
   black.png \
   yellow.png \
   purple.png \
-  conversation.png conversation.svg \
-  setup.png setup.svg \
-  fs.png fs.svg \
-  statistics.png statistics.svg \
-  peerinfo.png peerinfo.svg \
-  gns.png gns.svg \
-  identity.png identity.svg \
+  conversation.png conversation.svg conversation_small.png \
+  setup.png setup.svg setup_small.png \
+  fs.png fs.svg fs_small.png \
+  statistics.png statistics.svg statistics_small.png \
+  peerinfo.png peerinfo.svg peerinfo_small.png \
+  gns.png gns.svg gns_small.png \
+  identity.png identity.svg identity_small.png \
   searching_sources.gif \
   gnunet_gtk.glade \
   gnunet_fs_gtk_about_window.glade \
diff --git a/contrib/conversation_small.png b/contrib/conversation_small.png
new file mode 100644
index 00000000..1a65a732
--- /dev/null
+++ b/contrib/conversation_small.png
diff --git a/contrib/fs_small.png b/contrib/fs_small.png
new file mode 100644
index 00000000..950e9a5c
--- /dev/null
+++ b/contrib/fs_small.png
diff --git a/contrib/gns_small.png b/contrib/gns_small.png
new file mode 100644
index 00000000..ab7e12a4
--- /dev/null
+++ b/contrib/gns_small.png
diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade
index 2437996f..9d5d122c 100644
--- a/contrib/gnunet_conversation_gtk_main_window.glade
+++ b/contrib/gnunet_conversation_gtk_main_window.glade
@@ -250,8 +250,8 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="padding">5</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -284,7 +284,6 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="tooltip_text" translatable="yes">Enter the label under which your phone should be published in your ego's zone here. The default is 'phone'.</property>
-                                        <property name="max_length">63</property>
                                         <property name="caps_lock_warning">False</property>
                                         <signal name="preedit-changed" handler="gnunet_conversation_gtk_ego_label_entry_preedit_changed_cb" swapped="no"/>
                                       </object>
@@ -705,8 +704,8 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
diff --git a/contrib/gnunet_gtk.glade b/contrib/gnunet_gtk.glade
index 38368621..1b35a0d5 100644
--- a/contrib/gnunet_gtk.glade
+++ b/contrib/gnunet_gtk.glade
@@ -43,7 +43,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Statistics</property>
-                    <property name="pixbuf">statistics.png</property>
+                    <property name="pixbuf">statistics_small.png</property>
                   </object>
                   <packing>
                     <property name="tab_fill">False</property>
@@ -69,7 +69,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Information about known and connected peers</property>
-                    <property name="pixbuf">peerinfo.png</property>
+                    <property name="pixbuf">peerinfo_small.png</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -96,7 +96,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">GNU Name System Zone Management</property>
-                    <property name="pixbuf">gns.png</property>
+                    <property name="pixbuf">gns_small.png</property>
                   </object>
                   <packing>
                     <property name="position">2</property>
@@ -123,7 +123,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">File-Sharing</property>
-                    <property name="pixbuf">fs.png</property>
+                    <property name="pixbuf">fs_small.png</property>
                   </object>
                   <packing>
                     <property name="position">3</property>
@@ -150,7 +150,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Identity management</property>
-                    <property name="pixbuf">identity.png</property>
+                    <property name="pixbuf">identity_small.png</property>
                   </object>
                   <packing>
                     <property name="position">4</property>
@@ -175,7 +175,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Voice conversation</property>
-                    <property name="pixbuf">conversation.png</property>
+                    <property name="pixbuf">conversation_small.png</property>
                   </object>
                   <packing>
                     <property name="position">5</property>
@@ -201,7 +201,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Configuration</property>
-                    <property name="pixbuf">setup.png</property>
+                    <property name="pixbuf">setup_small.png</property>
                   </object>
                   <packing>
                     <property name="position">6</property>
diff --git a/contrib/identity_small.png b/contrib/identity_small.png
new file mode 100644
index 00000000..5eeb8e11
--- /dev/null
+++ b/contrib/identity_small.png
diff --git a/contrib/peerinfo_small.png b/contrib/peerinfo_small.png
new file mode 100644
index 00000000..b0c3ac8a
--- /dev/null
+++ b/contrib/peerinfo_small.png
diff --git a/contrib/setup_small.png b/contrib/setup_small.png
new file mode 100644
index 00000000..f55b97ba
--- /dev/null
+++ b/contrib/setup_small.png
diff --git a/contrib/statistics_small.png b/contrib/statistics_small.png
new file mode 100644
index 00000000..ff6634b4
--- /dev/null
+++ b/contrib/statistics_small.png