diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py
index 99467a86..8045a761 100644
--- a/src/bitmessageqt/bitmessageui.py
+++ b/src/bitmessageqt/bitmessageui.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'bitmessageui.ui'
 #
-# Created: Sat Jun 29 15:47:38 2013
+# Created: Sun Jun 30 03:08:39 2013
 #      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -26,7 +26,7 @@ except AttributeError:
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName(_fromUtf8("MainWindow"))
-        MainWindow.resize(847, 561)
+        MainWindow.resize(856, 564)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/can-icon-24px.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         MainWindow.setWindowIcon(icon)
@@ -120,7 +120,7 @@ class Ui_MainWindow(object):
         self.textEditBroadcastsMessage.setObjectName(_fromUtf8("textEditBroadcastsMessage"))
         self.verticalLayout_3.addWidget(self.textEditBroadcastsMessage)
         icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(_fromUtf8("../images/broadcasts.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon2.addPixmap(QtGui.QPixmap(_fromUtf8("images/broadcasts.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.broadcasts, icon2, _fromUtf8(""))
         self.send = QtGui.QWidget()
         self.send.setObjectName(_fromUtf8("send"))
@@ -128,7 +128,7 @@ class Ui_MainWindow(object):
         self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
         self.pushButtonLoadFromAddressBook = QtGui.QPushButton(self.send)
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(9)
         self.pushButtonLoadFromAddressBook.setFont(font)
         self.pushButtonLoadFromAddressBook.setObjectName(_fromUtf8("pushButtonLoadFromAddressBook"))
         self.gridLayout_2.addWidget(self.pushButtonLoadFromAddressBook, 3, 2, 1, 2)
@@ -174,6 +174,7 @@ class Ui_MainWindow(object):
         spacerItem1 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.gridLayout_2.addItem(spacerItem1, 3, 4, 1, 1)
         self.pushButtonSend = QtGui.QPushButton(self.send)
+        self.pushButtonSend.setMinimumSize(QtCore.QSize(100, 0))
         self.pushButtonSend.setObjectName(_fromUtf8("pushButtonSend"))
         self.gridLayout_2.addWidget(self.pushButtonSend, 7, 5, 1, 1)
         self.labelSendBroadcastWarning = QtGui.QLabel(self.send)
@@ -371,7 +372,7 @@ class Ui_MainWindow(object):
         self.networkstatus = QtGui.QWidget()
         self.networkstatus.setObjectName(_fromUtf8("networkstatus"))
         self.pushButtonStatusIcon = QtGui.QPushButton(self.networkstatus)
-        self.pushButtonStatusIcon.setGeometry(QtCore.QRect(680, 440, 21, 23))
+        self.pushButtonStatusIcon.setGeometry(QtCore.QRect(780, 440, 21, 23))
         self.pushButtonStatusIcon.setText(_fromUtf8(""))
         icon9 = QtGui.QIcon()
         icon9.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/redicon.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -428,7 +429,7 @@ class Ui_MainWindow(object):
         self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 847, 24))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 856, 24))
         self.menubar.setObjectName(_fromUtf8("menubar"))
         self.menuFile = QtGui.QMenu(self.menubar)
         self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -471,7 +472,7 @@ class Ui_MainWindow(object):
         self.menubar.addAction(self.menuHelp.menuAction())
 
         self.retranslateUi(MainWindow)
-        self.tabWidget.setCurrentIndex(0)
+        self.tabWidget.setCurrentIndex(1)
         QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.lineEditTo.setEnabled)
         QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("clicked(bool)")), self.labelSendBroadcastWarning.hide)
         QtCore.QObject.connect(self.radioButtonBroadcast, QtCore.SIGNAL(_fromUtf8("clicked()")), self.labelSendBroadcastWarning.show)
@@ -605,3 +606,13 @@ class Ui_MainWindow(object):
         self.actionDeleteAllTrashedMessages.setText(_translate("MainWindow", "Delete all trashed messages", None))
 
 import bitmessage_icons_rc
+
+if __name__ == "__main__":
+    import sys
+    app = QtGui.QApplication(sys.argv)
+    MainWindow = QtGui.QMainWindow()
+    ui = Ui_MainWindow()
+    ui.setupUi(MainWindow)
+    MainWindow.show()
+    sys.exit(app.exec_())
+
diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui
index b8f2c3f1..7cb0459b 100644
--- a/src/bitmessageqt/bitmessageui.ui
+++ b/src/bitmessageqt/bitmessageui.ui
@@ -6,15 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>847</width>
-    <height>561</height>
+    <width>856</width>
+    <height>564</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Bitmessage</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="bitmessage_icons.qrc">
     <normaloff>:/newPrefix/images/can-icon-24px.png</normaloff>:/newPrefix/images/can-icon-24px.png</iconset>
   </property>
   <property name="tabShape">
@@ -57,11 +57,11 @@
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="inbox">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/inbox.png</normaloff>:/newPrefix/images/inbox.png</iconset>
        </attribute>
        <attribute name="title">
@@ -146,7 +146,7 @@
       <widget class="QWidget" name="broadcasts">
        <attribute name="icon">
         <iconset>
-         <normaloff>../images/broadcasts.png</normaloff>../images/broadcasts.png</iconset>
+         <normaloff>images/broadcasts.png</normaloff>images/broadcasts.png</iconset>
        </attribute>
        <attribute name="title">
         <string>Broadcasts</string>
@@ -229,7 +229,7 @@
       </widget>
       <widget class="QWidget" name="send">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/send.png</normaloff>:/newPrefix/images/send.png</iconset>
        </attribute>
        <attribute name="title">
@@ -240,7 +240,7 @@
          <widget class="QPushButton" name="pushButtonLoadFromAddressBook">
           <property name="font">
            <font>
-            <pointsize>7</pointsize>
+            <pointsize>9</pointsize>
            </font>
           </property>
           <property name="text">
@@ -359,6 +359,12 @@ p, li { white-space: pre-wrap; }
         </item>
         <item row="7" column="5">
          <widget class="QPushButton" name="pushButtonSend">
+          <property name="minimumSize">
+           <size>
+            <width>100</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="text">
            <string>Send</string>
           </property>
@@ -387,7 +393,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="sent">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/sent.png</normaloff>:/newPrefix/images/sent.png</iconset>
        </attribute>
        <attribute name="title">
@@ -464,7 +470,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="youridentities">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/identities.png</normaloff>:/newPrefix/images/identities.png</iconset>
        </attribute>
        <attribute name="title">
@@ -564,7 +570,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="subscriptions">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/subscriptions.png</normaloff>:/newPrefix/images/subscriptions.png</iconset>
        </attribute>
        <attribute name="title">
@@ -649,7 +655,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="addressbook">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/addressbook.png</normaloff>:/newPrefix/images/addressbook.png</iconset>
        </attribute>
        <attribute name="title">
@@ -731,7 +737,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="blackwhitelist">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/blacklist.png</normaloff>:/newPrefix/images/blacklist.png</iconset>
        </attribute>
        <attribute name="title">
@@ -823,7 +829,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="networkstatus">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/networkstatus.png</normaloff>:/newPrefix/images/networkstatus.png</iconset>
        </attribute>
        <attribute name="title">
@@ -832,7 +838,7 @@ p, li { white-space: pre-wrap; }
        <widget class="QPushButton" name="pushButtonStatusIcon">
         <property name="geometry">
          <rect>
-          <x>680</x>
+          <x>780</x>
           <y>440</y>
           <width>21</width>
           <height>23</height>
@@ -842,7 +848,7 @@ p, li { white-space: pre-wrap; }
          <string/>
         </property>
         <property name="icon">
-         <iconset>
+         <iconset resource="bitmessage_icons.qrc">
           <normaloff>:/newPrefix/images/redicon.png</normaloff>:/newPrefix/images/redicon.png</iconset>
         </property>
         <property name="flat">
@@ -1008,7 +1014,7 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>847</width>
+     <width>856</width>
      <height>24</height>
     </rect>
    </property>
diff --git a/src/images/addressbook.png b/src/bitmessageqt/images/addressbook.png
similarity index 100%
rename from src/images/addressbook.png
rename to src/bitmessageqt/images/addressbook.png
diff --git a/src/images/bitmessage.icns b/src/bitmessageqt/images/bitmessage.icns
similarity index 100%
rename from src/images/bitmessage.icns
rename to src/bitmessageqt/images/bitmessage.icns
diff --git a/src/images/blacklist.png b/src/bitmessageqt/images/blacklist.png
similarity index 100%
rename from src/images/blacklist.png
rename to src/bitmessageqt/images/blacklist.png
diff --git a/src/images/broadcasts.png b/src/bitmessageqt/images/broadcasts.png
similarity index 100%
rename from src/images/broadcasts.png
rename to src/bitmessageqt/images/broadcasts.png
diff --git a/src/images/can-icon-16px.png b/src/bitmessageqt/images/can-icon-16px.png
similarity index 100%
rename from src/images/can-icon-16px.png
rename to src/bitmessageqt/images/can-icon-16px.png
diff --git a/src/images/can-icon-24px-green.png b/src/bitmessageqt/images/can-icon-24px-green.png
similarity index 100%
rename from src/images/can-icon-24px-green.png
rename to src/bitmessageqt/images/can-icon-24px-green.png
diff --git a/src/images/can-icon-24px-red.png b/src/bitmessageqt/images/can-icon-24px-red.png
similarity index 100%
rename from src/images/can-icon-24px-red.png
rename to src/bitmessageqt/images/can-icon-24px-red.png
diff --git a/src/images/can-icon-24px-yellow.png b/src/bitmessageqt/images/can-icon-24px-yellow.png
similarity index 100%
rename from src/images/can-icon-24px-yellow.png
rename to src/bitmessageqt/images/can-icon-24px-yellow.png
diff --git a/src/images/can-icon-24px.png b/src/bitmessageqt/images/can-icon-24px.png
similarity index 100%
rename from src/images/can-icon-24px.png
rename to src/bitmessageqt/images/can-icon-24px.png
diff --git a/src/images/can-icon.ico b/src/bitmessageqt/images/can-icon.ico
similarity index 100%
rename from src/images/can-icon.ico
rename to src/bitmessageqt/images/can-icon.ico
diff --git a/src/images/greenicon.png b/src/bitmessageqt/images/greenicon.png
similarity index 100%
rename from src/images/greenicon.png
rename to src/bitmessageqt/images/greenicon.png
diff --git a/src/images/identities.png b/src/bitmessageqt/images/identities.png
similarity index 100%
rename from src/images/identities.png
rename to src/bitmessageqt/images/identities.png
diff --git a/src/images/inbox.png b/src/bitmessageqt/images/inbox.png
similarity index 100%
rename from src/images/inbox.png
rename to src/bitmessageqt/images/inbox.png
diff --git a/src/images/networkstatus.png b/src/bitmessageqt/images/networkstatus.png
similarity index 100%
rename from src/images/networkstatus.png
rename to src/bitmessageqt/images/networkstatus.png
diff --git a/src/images/redicon.png b/src/bitmessageqt/images/redicon.png
similarity index 100%
rename from src/images/redicon.png
rename to src/bitmessageqt/images/redicon.png
diff --git a/src/images/send.png b/src/bitmessageqt/images/send.png
similarity index 100%
rename from src/images/send.png
rename to src/bitmessageqt/images/send.png
diff --git a/src/images/sent.png b/src/bitmessageqt/images/sent.png
similarity index 100%
rename from src/images/sent.png
rename to src/bitmessageqt/images/sent.png
diff --git a/src/images/subscriptions.png b/src/bitmessageqt/images/subscriptions.png
similarity index 100%
rename from src/images/subscriptions.png
rename to src/bitmessageqt/images/subscriptions.png
diff --git a/src/images/yellowicon.png b/src/bitmessageqt/images/yellowicon.png
similarity index 100%
rename from src/images/yellowicon.png
rename to src/bitmessageqt/images/yellowicon.png