diff --git a/src/gui/qt/selectavatardialog.ui b/src/gui/qt/selectavatardialog.ui
index 65b33b41..0785e51f 100644
--- a/src/gui/qt/selectavatardialog.ui
+++ b/src/gui/qt/selectavatardialog.ui
@@ -5,29 +5,39 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>478</width>
-    <height>272</height>
+    <width>548</width>
+    <height>408</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>0</hsizetype>
+    <vsizetype>0</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>548</width>
+    <height>408</height>
+   </size>
+  </property>
+  <property name="maximumSize" >
+   <size>
+    <width>548</width>
+    <height>408</height>
+   </size>
+  </property>
   <property name="windowTitle" >
    <string>Please select an avatar</string>
   </property>
-  <widget class="QListWidget" name="listWidget" >
-   <property name="geometry" >
-    <rect>
-     <x>9</x>
-     <y>9</y>
-     <width>460</width>
-     <height>220</height>
-    </rect>
-   </property>
-  </widget>
   <widget class="QDialogButtonBox" name="buttonBox" >
    <property name="geometry" >
     <rect>
      <x>9</x>
-     <y>235</y>
-     <width>460</width>
+     <y>371</y>
+     <width>530</width>
      <height>28</height>
     </rect>
    </property>
@@ -38,6 +48,84 @@
     <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
    </property>
   </widget>
+  <widget class="QGroupBox" name="groupBox" >
+   <property name="geometry" >
+    <rect>
+     <x>9</x>
+     <y>9</y>
+     <width>530</width>
+     <height>284</height>
+    </rect>
+   </property>
+   <property name="title" >
+    <string>Select an avatar</string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="checked" >
+    <bool>true</bool>
+   </property>
+   <widget class="QListWidget" name="listWidget" >
+    <property name="geometry" >
+     <rect>
+      <x>11</x>
+      <y>29</y>
+      <width>508</width>
+      <height>244</height>
+     </rect>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QGroupBox" name="groupBox_2" >
+   <property name="geometry" >
+    <rect>
+     <x>9</x>
+     <y>299</y>
+     <width>530</width>
+     <height>66</height>
+    </rect>
+   </property>
+   <property name="title" >
+    <string>Load avatar from external file</string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="checked" >
+    <bool>false</bool>
+   </property>
+   <layout class="QGridLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item row="0" column="1" >
+     <widget class="QPushButton" name="pushButton_openAvatarFile1" >
+      <property name="minimumSize" >
+       <size>
+        <width>27</width>
+        <height>23</height>
+       </size>
+      </property>
+      <property name="maximumSize" >
+       <size>
+        <width>27</width>
+        <height>23</height>
+       </size>
+      </property>
+      <property name="icon" >
+       <iconset resource="resources.qrc" >:/graphics/resources/graphics/fileopen16.png</iconset>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0" >
+     <widget class="QLineEdit" name="lineEdit" />
+    </item>
+   </layout>
+  </widget>
  </widget>
  <resources/>
  <connections>
@@ -49,7 +137,7 @@
    <hints>
     <hint type="sourcelabel" >
      <x>248</x>
-     <y>254</y>
+     <y>390</y>
     </hint>
     <hint type="destinationlabel" >
      <x>157</x>
@@ -65,7 +153,7 @@
    <hints>
     <hint type="sourcelabel" >
      <x>316</x>
-     <y>260</y>
+     <y>396</y>
     </hint>
     <hint type="destinationlabel" >
      <x>286</x>
@@ -73,5 +161,53 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>groupBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>listWidget</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>47</x>
+     <y>15</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>273</x>
+     <y>159</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>groupBox_2</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>lineEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>42</x>
+     <y>308</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>257</x>
+     <y>340</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>groupBox_2</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>pushButton_openAvatarFile1</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>273</x>
+     <y>331</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>514</x>
+     <y>340</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
index 261c04cc..cd42e056 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
@@ -47,13 +47,17 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
 		listWidget->addItem(myItem);
 	};
 
+	QObject::connect(groupBox, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBox1(bool)));
+	QObject::connect(groupBox_2, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBox2(bool)));
+
 }
 
 void selectAvatarDialogImpl::exec() {
 
-	
-
-
 	QDialog::exec();
-
 }
+
+void selectAvatarDialogImpl::toggleGroupBox1(bool toogleState) { if(groupBox->isChecked()) groupBox_2->setChecked(FALSE); }
+
+void selectAvatarDialogImpl::toggleGroupBox2(bool toogleState) { if(groupBox_2->isChecked()) groupBox->setChecked(FALSE); }
+
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h
index 32d3d832..1121e5e9 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h
+++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h
@@ -37,6 +37,8 @@ public:
 
 	
 public slots:
+	void toggleGroupBox1(bool);
+	void toggleGroupBox2(bool);
 
 
 private: