diff --git a/retroshare-gui/src/gui/settings/NotifyPage.ui b/retroshare-gui/src/gui/settings/NotifyPage.ui
index d81c2bbde..4594002bc 100755
--- a/retroshare-gui/src/gui/settings/NotifyPage.ui
+++ b/retroshare-gui/src/gui/settings/NotifyPage.ui
@@ -644,7 +644,7 @@
           <item>
            <widget class="QCheckBox" name="popup_Connect">
             <property name="text">
-             <string>Peer Connect</string>
+             <string>Friend Connect</string>
             </property>
            </widget>
           </item>
diff --git a/retroshare-gui/src/gui/toaster/OnlineToaster.ui b/retroshare-gui/src/gui/toaster/OnlineToaster.ui
index 560575c9f..1b340883d 100644
--- a/retroshare-gui/src/gui/toaster/OnlineToaster.ui
+++ b/retroshare-gui/src/gui/toaster/OnlineToaster.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>OnlineToaster</class>
- <widget class="QWidget" name="OnlineToaster" >
-  <property name="geometry" >
+ <widget class="QWidget" name="OnlineToaster">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,71 +10,71 @@
     <height>168</height>
    </rect>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>0</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QFrame" name="windowFrame" >
-     <property name="frameShape" >
+   <item row="0" column="0">
+    <widget class="QFrame" name="windowFrame">
+     <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>0</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>0</number>
       </property>
-      <item row="0" column="0" >
-       <layout class="QGridLayout" >
-        <property name="margin" >
+      <item row="0" column="0">
+       <layout class="QGridLayout">
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="spacing" >
+        <property name="spacing">
          <number>0</number>
         </property>
-        <item row="0" column="2" >
-         <widget class="QPushButton" name="closeButton" >
-          <property name="minimumSize" >
+        <item row="0" column="2">
+         <widget class="QPushButton" name="closeButton">
+          <property name="minimumSize">
            <size>
             <width>18</width>
             <height>18</height>
            </size>
           </property>
-          <property name="maximumSize" >
+          <property name="maximumSize">
            <size>
             <width>18</width>
             <height>18</height>
            </size>
           </property>
-          <property name="icon" >
-           <iconset resource="../images.qrc" >
+          <property name="icon">
+           <iconset resource="../images.qrc">
             <normaloff>:/images/close-down.png</normaloff>:/images/close-down.png</iconset>
           </property>
-          <property name="iconSize" >
+          <property name="iconSize">
            <size>
             <width>16</width>
             <height>16</height>
            </size>
           </property>
-          <property name="flat" >
+          <property name="flat">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
+        <item row="0" column="1">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>225</width>
             <height>22</height>
@@ -83,51 +84,51 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="0" >
-       <layout class="QGridLayout" >
-        <property name="leftMargin" >
+      <item row="1" column="0">
+       <layout class="QGridLayout">
+        <property name="leftMargin">
          <number>4</number>
         </property>
-        <property name="rightMargin" >
+        <property name="rightMargin">
          <number>4</number>
         </property>
-        <property name="spacing" >
+        <property name="spacing">
          <number>0</number>
         </property>
-        <item rowspan="3" row="0" column="0" >
-         <widget class="QLabel" name="pixmaplabel" >
-          <property name="minimumSize" >
+        <item row="0" column="0" rowspan="3">
+         <widget class="QLabel" name="pixmaplabel">
+          <property name="minimumSize">
            <size>
             <width>74</width>
             <height>74</height>
            </size>
           </property>
-          <property name="maximumSize" >
+          <property name="maximumSize">
            <size>
             <width>74</width>
             <height>74</height>
            </size>
           </property>
-          <property name="styleSheet" >
-           <string notr="true" >border-image: url(:/images/avatar_background.png);</string>
+          <property name="styleSheet">
+           <string notr="true">border-image: url(:/images/avatar_background.png);</string>
           </property>
-          <property name="text" >
+          <property name="text">
            <string/>
           </property>
-          <property name="pixmap" >
-           <pixmap resource="../images.qrc" >:/images/user/personal64.png</pixmap>
+          <property name="pixmap">
+           <pixmap resource="../images.qrc">:/images/user/personal64.png</pixmap>
           </property>
-          <property name="alignment" >
+          <property name="alignment">
            <set>Qt::AlignCenter</set>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
+        <item row="0" column="1">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>121</width>
             <height>20</height>
@@ -135,29 +136,29 @@
           </property>
          </spacer>
         </item>
-        <item row="1" column="1" >
-         <widget class="QPushButton" name="messageButton" >
-          <property name="font" >
+        <item row="1" column="1">
+         <widget class="QPushButton" name="messageButton">
+          <property name="font">
            <font>
             <weight>75</weight>
             <bold>true</bold>
            </font>
           </property>
-          <property name="styleSheet" >
-           <string notr="true" >color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+          <property name="styleSheet">
+           <string notr="true">color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
                                      stop: 0 #49881F, stop: 1 #49881F );</string>
           </property>
-          <property name="text" >
-           <string>Peer Online</string>
+          <property name="text">
+           <string>Friend Online</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="1" >
+        <item row="2" column="1">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>121</width>
             <height>20</height>
@@ -167,17 +168,17 @@
         </item>
        </layout>
       </item>
-      <item row="2" column="0" >
-       <layout class="QGridLayout" >
-        <property name="topMargin" >
+      <item row="2" column="0">
+       <layout class="QGridLayout">
+        <property name="topMargin">
          <number>6</number>
         </property>
-        <item row="0" column="0" >
+        <item row="0" column="0">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>81</width>
             <height>20</height>
@@ -185,19 +186,19 @@
           </property>
          </spacer>
         </item>
-        <item row="0" column="1" >
-         <widget class="QLabel" name="messageLabel" >
-          <property name="text" >
+        <item row="0" column="1">
+         <widget class="QLabel" name="messageLabel">
+          <property name="text">
            <string/>
           </property>
          </widget>
         </item>
-        <item row="0" column="2" >
+        <item row="0" column="2">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>131</width>
             <height>20</height>
@@ -207,12 +208,12 @@
         </item>
        </layout>
       </item>
-      <item row="3" column="0" >
+      <item row="3" column="0">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>384</width>
           <height>61</height>
@@ -230,7 +231,8 @@
   <tabstop>closeButton</tabstop>
  </tabstops>
  <resources>
-  <include location="../images.qrc" />
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>