diff --git a/PokemonGoIV/0Main.vb b/PokemonGoIV/0Main.vb
index a923ffc..c9d897e 100644
--- a/PokemonGoIV/0Main.vb
+++ b/PokemonGoIV/0Main.vb
@@ -70,8 +70,7 @@ Sub subMain
 	End If
 	maIVs = fnFindIV (aQuery)
 	If UBound (maIVs) = -1 Then
-		'MsgBox "Found no matching IV."
-		MsgBox fnGetResString ("msg1000")
+		MsgBox fnGetResString ("ErrorNotFound")
 	Else
 		subSaveIV (aQuery, maIVs)
 	End If
@@ -94,6 +93,11 @@ Function fnAskParam As aFindIVParam
 	oDialog.getControl ("cbxBest3").setVisible (False)
 	oDialog.getControl ("lstApprasal2").setVisible (False)
 	
+	oDialog.getControl ("imgPokemon").getModel.setPropertyValue ( _
+	    "ImageURL", fnGetImageUrl ("Unknown"))
+	oDialog.getControl ("imgTeamLogo").getModel.setPropertyValue ( _
+	    "ImageURL", fnGetImageUrl ("Unknown"))
+	
 	If oDialog.execute = 0 Then
 		aQuery.bIsCancelled = True
 		fnAskParam = aQuery
@@ -233,9 +237,17 @@ Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object)
 	
 	oDialog = oEvent.Source.getContext
 	
-	oImageModel = oDialog.getControl ("imgTeam").getModel
+	oImageModel = oDialog.getControl ("imgTeamLogo").getModel
 	oImageModel.setPropertyValue ("ImageURL", _
-		fnGetImageUrl ("TeamValor"))
+		fnGetImageUrl ("TeamLogoValor"))
+	oDialog.getControl ("imgTeamLeader").setVisible (True)
+	oImageModel = oDialog.getControl ("imgTeamLeader").getModel
+	oImageModel.setPropertyValue ("ImageURL", _
+		fnGetImageUrl ("TeamLeaderCandela"))
+	
+	oText = oDialog.getControl ("txtLeaderAppraise")
+	oText.setVisible (True)
+	oText.setText (fnGetResString ("AppraiseFromCandela"))
 	
 	mItems = Array ( _
 		"Overall, your [Pokémon] simply amazes me. It can accomplish anything!", _
@@ -248,8 +260,8 @@ Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl ("txtBestBefore")
-	oText.setPosSize (30, 96, 20, 8, _
-		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
+	oText.setPosSize (-1, -1, 20, -1, _
+		com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText ("Its")
 	
@@ -257,12 +269,12 @@ Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object)
 	oList = oDialog.getControl ("lstBest")
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
-	oList.setPosSize (50, 96, 35, 8, _
+	oList.setPosSize (140, -1, -1, -1, _
 		com.sun.star.awt.PosSize.X)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl ("txtBestAfter")
-	oText.setPosSize (145, 96, 160, 8, _
+	oText.setPosSize (240, -1, 160, -1, _
 		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText ("is its strongest feature.")
@@ -296,9 +308,17 @@ Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object)
 	
 	oDialog = oEvent.Source.getContext
 	
-	oImageModel = oDialog.getControl ("imgTeam").getModel
+	oImageModel = oDialog.getControl ("imgTeamLogo").getModel
 	oImageModel.setPropertyValue ("ImageURL", _
-		fnGetImageUrl ("TeamMystic"))
+		fnGetImageUrl ("TeamLogoMystic"))
+	oDialog.getControl ("imgTeamLeader").setVisible (True)
+	oImageModel = oDialog.getControl ("imgTeamLeader").getModel
+	oImageModel.setPropertyValue ("ImageURL", _
+		fnGetImageUrl ("TeamLeaderBlanche"))
+	
+	oText = oDialog.getControl ("txtLeaderAppraise")
+	oText.setVisible (True)
+	oText.setText (fnGetResString ("AppraiseFromBlanche"))
 	
 	mItems = Array ( _
 		"Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!", _
@@ -311,8 +331,8 @@ Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl ("txtBestBefore")
-	oText.setPosSize (30, 96, 200, 8, _
-		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
+	oText.setPosSize (-1, -1, 200, -1, _
+		com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText ("I see that its best attribute is its")
 	
@@ -320,12 +340,12 @@ Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object)
 	oList = oDialog.getControl ("lstBest")
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
-	oList.setPosSize (230, 96, 35, 8, _
+	oList.setPosSize (320, -1, -1, -1, _
 		com.sun.star.awt.PosSize.X)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl ("txtBestAfter")
-	oText.setPosSize (325, 96, 5, 8, _
+	oText.setPosSize (415, -1, 5, -1, _
 		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText (".")
@@ -359,9 +379,17 @@ Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object)
 	
 	oDialog = oEvent.Source.getContext
 	
-	oImageModel = oDialog.getControl ("imgTeam").getModel
+	oImageModel = oDialog.getControl ("imgTeamLogo").getModel
 	oImageModel.setPropertyValue ("ImageURL", _
-		fnGetImageUrl ("TeamInstinct"))
+		fnGetImageUrl ("TeamLogoInstinct"))
+	oDialog.getControl ("imgTeamLeader").setVisible (True)
+	oImageModel = oDialog.getControl ("imgTeamLeader").getModel
+	oImageModel.setPropertyValue ("ImageURL", _
+		fnGetImageUrl ("TeamLeaderSpark"))
+	
+	oText = oDialog.getControl ("txtLeaderAppraise")
+	oText.setVisible (True)
+	oText.setText (fnGetResString ("AppraiseFromSpark"))
 	
 	mItems = Array ( _
 		"Overall, your [Pokémon] looks like it can really battle with the best of them!", _
@@ -374,8 +402,8 @@ Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl ("txtBestBefore")
-	oText.setPosSize (30, 96, 115, 8, _
-		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
+	oText.setPosSize (-1, -1, 115, -1, _
+		com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText ("Its best quality is")
 	
@@ -383,12 +411,12 @@ Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object)
 	oList = oDialog.getControl ("lstBest")
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
-	oList.setPosSize (145, 96, 35, 8, _
+	oList.setPosSize (240, -1, -1, -1, _
 		com.sun.star.awt.PosSize.X)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl ("txtBestAfter")
-	oText.setPosSize (240, 96, 5, 8, _
+	oText.setPosSize (335, -1, 5, -1, _
 		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText (".")
diff --git a/TODO b/TODO
index faf9413..d424c04 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
 PokemonGoIV TODO
 
-* Show images of teams, team leaders and Pokémons.
+* Clean-up event handlers.
+* LibreOffice compability.
 * Center the dialog.
diff --git a/excludes/1481132741_164_QuestionMark.svg b/excludes/1481132741_164_QuestionMark.svg
new file mode 100644
index 0000000..f8deb47
--- /dev/null
+++ b/excludes/1481132741_164_QuestionMark.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="16px" version="1.1" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><title/><defs/><g fill="none" fill-rule="evenodd" id="Icons with numbers" stroke="none" stroke-width="1"><g fill="#000000" id="Group" transform="translate(-48.000000, -432.000000)"><path d="M54.8796844,443.0591 L54.8796844,445 L57.2307692,445 L57.2307692,443.0591 Z M56,448 C51.5817218,448 48,444.418278 48,440 C48,435.581722 51.5817218,432 56,432 C60.4182782,432 64,435.581722 64,440 C64,444.418278 60.4182782,448 56,448 Z M53.5700197,435.51041 C52.5864514,436.043208 52.0631167,436.947609 52,438.22364 L54.2800789,438.22364 C54.2800789,437.852024 54.4076253,437.493845 54.6627219,437.149093 C54.9178185,436.804341 55.3504243,436.631968 55.9605523,436.631968 C56.5811997,436.631968 57.0085458,436.771881 57.2426036,437.051713 C57.4766613,437.331544 57.5936884,437.641592 57.5936884,437.981867 C57.5936884,438.277369 57.4884955,438.548241 57.2781065,438.794493 L56.8205128,439.190732 L56.2445759,439.573539 C55.6765258,439.949633 55.3241295,440.282067 55.1873767,440.570853 C55.0506239,440.859639 54.9664696,441.382356 54.9349112,442.139019 L57.0650888,442.139019 C57.0703485,441.780835 57.1045362,441.516679 57.1676529,441.346541 C57.2675876,441.077903 57.4700839,440.842849 57.7751479,440.64137 L58.3353057,440.271995 C58.9033559,439.895901 59.28731,439.586972 59.4871795,439.345198 C59.8290615,438.946718 60,438.456461 60,437.874412 C60,436.925225 59.6068415,436.208867 58.8205128,435.725319 C58.0341841,435.241771 57.0466858,435 55.8579882,435 C54.9533157,435 54.1906671,435.170135 53.5700197,435.51041 Z M53.5700197,435.51041" id="Oval 318"/></g></g></svg>
\ No newline at end of file
diff --git a/excludes/black.png b/excludes/black.png
new file mode 100644
index 0000000..28e8c34
Binary files /dev/null and b/excludes/black.png differ
diff --git a/excludes/team-leaders/slack-imgs.com.0.jpeg b/excludes/team-leaders/slack-imgs.com.0.jpeg
new file mode 100644
index 0000000..20c9a87
Binary files /dev/null and b/excludes/team-leaders/slack-imgs.com.0.jpeg differ
diff --git a/excludes/team-leaders/team-leader-blanche.png b/excludes/team-leaders/team-leader-blanche.png
new file mode 100644
index 0000000..723561b
Binary files /dev/null and b/excludes/team-leaders/team-leader-blanche.png differ
diff --git a/excludes/team-leaders/team-leader-candela.png b/excludes/team-leaders/team-leader-candela.png
new file mode 100644
index 0000000..745a9e8
Binary files /dev/null and b/excludes/team-leaders/team-leader-candela.png differ
diff --git a/excludes/team-leaders/team-leader-spark.png b/excludes/team-leaders/team-leader-spark.png
new file mode 100644
index 0000000..95d8d52
Binary files /dev/null and b/excludes/team-leaders/team-leader-spark.png differ
diff --git a/oxt/AddonConfiguration.xcu b/oxt/AddonConfiguration.xcu
index d04a0a3..4a65e60 100644
--- a/oxt/AddonConfiguration.xcu
+++ b/oxt/AddonConfiguration.xcu
@@ -34,24 +34,39 @@
 	
 <!--  File resources (supports localization) -->
 	<node oor:name="FileResources">
-		<node oor:name="Black" oor:op="replace">
+		<node oor:name="Unknown" oor:op="replace">
 			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
-				<value>%origin%/icons/black.png</value>
+				<value>%origin%/icons/unknown.png</value>
 			</prop>
 		</node>
-		<node oor:name="TeamValor" oor:op="replace">
+		<node oor:name="TeamLogoValor" oor:op="replace">
 			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
-				<value>%origin%/icons/team-valor.png</value>
+				<value>%origin%/icons/team-logo-valor.png</value>
 			</prop>
 		</node>
-		<node oor:name="TeamMystic" oor:op="replace">
+		<node oor:name="TeamLogoMystic" oor:op="replace">
 			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
-				<value>%origin%/icons/team-mystic.png</value>
+				<value>%origin%/icons/team-logo-mystic.png</value>
 			</prop>
 		</node>
-		<node oor:name="TeamInstinct" oor:op="replace">
+		<node oor:name="TeamLogoInstinct" oor:op="replace">
 			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
-				<value>%origin%/icons/team-instinct.png</value>
+				<value>%origin%/icons/team-logo-instinct.png</value>
+			</prop>
+		</node>
+		<node oor:name="TeamLeaderCandela" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/team-leader-candela.png</value>
+			</prop>
+		</node>
+		<node oor:name="TeamLeaderBlanche" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/team-leader-blanche.png</value>
+			</prop>
+		</node>
+		<node oor:name="TeamLeaderSpark" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/team-leader-spark.png</value>
 			</prop>
 		</node>
 		<node oor:name="PokemonBulbasaur" oor:op="replace">
@@ -813,11 +828,29 @@
 	
 <!--  Localized messages -->	
 	<node oor:name="Messages">
-		<node oor:name="msg1000" oor:op="replace">		
+		<node oor:name="ErrorNotFound" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Found no matching IV.</value>
 				<value xml:lang="zh-TW">找不出符合的 IV 值。</value>
 			</prop>
 		</node>
+		<node oor:name="AppraiseFromCandela" oor:op="replace">		
+			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
+				<value>Candela, leader of Team Valor, says:</value>
+				<value xml:lang="zh-TW">Valor 隊隊長 Candela 說：</value>
+			</prop>
+		</node>
+		<node oor:name="AppraiseFromBlanche" oor:op="replace">		
+			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
+				<value>Blanche, leader of Team Mystic, says:</value>
+				<value xml:lang="zh-TW">Mystic 隊隊長 Blanche 說：</value>
+			</prop>
+		</node>
+		<node oor:name="AppraiseFromSpark" oor:op="replace">		
+			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
+				<value>Spark, leader of Team Instinct, says:</value>
+				<value xml:lang="zh-TW">Instinct 隊隊長 Spark 說：</value>
+			</prop>
+		</node>
 	</node>
 </oor:component-data>
diff --git a/oxt/PokemonGoIV/0Main.xba b/oxt/PokemonGoIV/0Main.xba
index ed6d3cc..83dd58c 100644
--- a/oxt/PokemonGoIV/0Main.xba
+++ b/oxt/PokemonGoIV/0Main.xba
@@ -72,8 +72,7 @@ Sub subMain
 	End If
 	maIVs = fnFindIV (aQuery)
 	If UBound (maIVs) = -1 Then
-		&apos;MsgBox &quot;Found no matching IV.&quot;
-		MsgBox fnGetResString (&quot;msg1000&quot;)
+		MsgBox fnGetResString (&quot;ErrorNotFound&quot;)
 	Else
 		subSaveIV (aQuery, maIVs)
 	End If
@@ -96,6 +95,11 @@ Function fnAskParam As aFindIVParam
 	oDialog.getControl (&quot;cbxBest3&quot;).setVisible (False)
 	oDialog.getControl (&quot;lstApprasal2&quot;).setVisible (False)
 	
+	oDialog.getControl (&quot;imgPokemon&quot;).getModel.setPropertyValue ( _
+	    &quot;ImageURL&quot;, fnGetImageUrl (&quot;Unknown&quot;))
+	oDialog.getControl (&quot;imgTeamLogo&quot;).getModel.setPropertyValue ( _
+	    &quot;ImageURL&quot;, fnGetImageUrl (&quot;Unknown&quot;))
+	
 	If oDialog.execute = 0 Then
 		aQuery.bIsCancelled = True
 		fnAskParam = aQuery
@@ -235,9 +239,17 @@ Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object)
 	
 	oDialog = oEvent.Source.getContext
 	
-	oImageModel = oDialog.getControl (&quot;imgTeam&quot;).getModel
+	oImageModel = oDialog.getControl (&quot;imgTeamLogo&quot;).getModel
 	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
-		fnGetImageUrl (&quot;TeamValor&quot;))
+		fnGetImageUrl (&quot;TeamLogoValor&quot;))
+	oDialog.getControl (&quot;imgTeamLeader&quot;).setVisible (True)
+	oImageModel = oDialog.getControl (&quot;imgTeamLeader&quot;).getModel
+	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
+		fnGetImageUrl (&quot;TeamLeaderCandela&quot;))
+	
+	oText = oDialog.getControl (&quot;txtLeaderAppraise&quot;)
+	oText.setVisible (True)
+	oText.setText (fnGetResString (&quot;AppraiseFromCandela&quot;))
 	
 	mItems = Array ( _
 		&quot;Overall, your [Pokémon] simply amazes me. It can accomplish anything!&quot;, _
@@ -250,8 +262,8 @@ Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl (&quot;txtBestBefore&quot;)
-	oText.setPosSize (30, 96, 20, 8, _
-		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
+	oText.setPosSize (-1, -1, 20, -1, _
+		com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText (&quot;Its&quot;)
 	
@@ -259,12 +271,12 @@ Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object)
 	oList = oDialog.getControl (&quot;lstBest&quot;)
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
-	oList.setPosSize (50, 96, 35, 8, _
+	oList.setPosSize (140, -1, -1, -1, _
 		com.sun.star.awt.PosSize.X)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl (&quot;txtBestAfter&quot;)
-	oText.setPosSize (145, 96, 160, 8, _
+	oText.setPosSize (240, -1, 160, -1, _
 		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText (&quot;is its strongest feature.&quot;)
@@ -298,9 +310,17 @@ Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object)
 	
 	oDialog = oEvent.Source.getContext
 	
-	oImageModel = oDialog.getControl (&quot;imgTeam&quot;).getModel
+	oImageModel = oDialog.getControl (&quot;imgTeamLogo&quot;).getModel
 	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
-		fnGetImageUrl (&quot;TeamMystic&quot;))
+		fnGetImageUrl (&quot;TeamLogoMystic&quot;))
+	oDialog.getControl (&quot;imgTeamLeader&quot;).setVisible (True)
+	oImageModel = oDialog.getControl (&quot;imgTeamLeader&quot;).getModel
+	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
+		fnGetImageUrl (&quot;TeamLeaderBlanche&quot;))
+	
+	oText = oDialog.getControl (&quot;txtLeaderAppraise&quot;)
+	oText.setVisible (True)
+	oText.setText (fnGetResString (&quot;AppraiseFromBlanche&quot;))
 	
 	mItems = Array ( _
 		&quot;Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!&quot;, _
@@ -313,8 +333,8 @@ Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl (&quot;txtBestBefore&quot;)
-	oText.setPosSize (30, 96, 200, 8, _
-		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
+	oText.setPosSize (-1, -1, 200, -1, _
+		com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText (&quot;I see that its best attribute is its&quot;)
 	
@@ -322,12 +342,12 @@ Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object)
 	oList = oDialog.getControl (&quot;lstBest&quot;)
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
-	oList.setPosSize (230, 96, 35, 8, _
+	oList.setPosSize (320, -1, -1, -1, _
 		com.sun.star.awt.PosSize.X)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl (&quot;txtBestAfter&quot;)
-	oText.setPosSize (325, 96, 5, 8, _
+	oText.setPosSize (415, -1, 5, -1, _
 		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText (&quot;.&quot;)
@@ -361,9 +381,17 @@ Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object)
 	
 	oDialog = oEvent.Source.getContext
 	
-	oImageModel = oDialog.getControl (&quot;imgTeam&quot;).getModel
+	oImageModel = oDialog.getControl (&quot;imgTeamLogo&quot;).getModel
 	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
-		fnGetImageUrl (&quot;TeamInstinct&quot;))
+		fnGetImageUrl (&quot;TeamLogoInstinct&quot;))
+	oDialog.getControl (&quot;imgTeamLeader&quot;).setVisible (True)
+	oImageModel = oDialog.getControl (&quot;imgTeamLeader&quot;).getModel
+	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
+		fnGetImageUrl (&quot;TeamLeaderSpark&quot;))
+	
+	oText = oDialog.getControl (&quot;txtLeaderAppraise&quot;)
+	oText.setVisible (True)
+	oText.setText (fnGetResString (&quot;AppraiseFromSpark&quot;))
 	
 	mItems = Array ( _
 		&quot;Overall, your [Pokémon] looks like it can really battle with the best of them!&quot;, _
@@ -376,8 +404,8 @@ Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl (&quot;txtBestBefore&quot;)
-	oText.setPosSize (30, 96, 115, 8, _
-		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
+	oText.setPosSize (-1, -1, 115, -1, _
+		com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText (&quot;Its best quality is&quot;)
 	
@@ -385,12 +413,12 @@ Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object)
 	oList = oDialog.getControl (&quot;lstBest&quot;)
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
-	oList.setPosSize (145, 96, 35, 8, _
+	oList.setPosSize (240, -1, -1, -1, _
 		com.sun.star.awt.PosSize.X)
 	oList.setVisible (True)
 	
 	oText = oDialog.getControl (&quot;txtBestAfter&quot;)
-	oText.setPosSize (240, 96, 5, 8, _
+	oText.setPosSize (335, -1, 5, -1, _
 		com.sun.star.awt.PosSize.X + com.sun.star.awt.PosSize.WIDTH)
 	oText.setVisible (True)
 	oText.setText (&quot;.&quot;)
diff --git a/oxt/PokemonGoIV/DialogStrings_en_US.properties b/oxt/PokemonGoIV/DialogStrings_en_US.properties
index fb69cda..ccc37df 100644
--- a/oxt/PokemonGoIV/DialogStrings_en_US.properties
+++ b/oxt/PokemonGoIV/DialogStrings_en_US.properties
@@ -39,3 +39,5 @@
 195.DlgMain.txtBestAfter.HelpText=
 201.DlgMain.cbxBest2.HelpText=
 203.DlgMain.cbxBest3.HelpText=
+208.DlgMain.txtLeaderAppraise.HelpText=
+210.DlgMain.imgTeamLeader.HelpText=
diff --git a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
index 4820686..cf04c63 100644
--- a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
+++ b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
@@ -39,3 +39,5 @@
 195.DlgMain.txtBestAfter.HelpText=
 201.DlgMain.cbxBest2.HelpText=
 203.DlgMain.cbxBest3.HelpText=
+208.DlgMain.txtLeaderAppraise.HelpText=
+210.DlgMain.imgTeamLeader.HelpText=
diff --git a/oxt/PokemonGoIV/DlgMain.xdl b/oxt/PokemonGoIV/DlgMain.xdl
index 3eba39f..fd862e4 100644
--- a/oxt/PokemonGoIV/DlgMain.xdl
+++ b/oxt/PokemonGoIV/DlgMain.xdl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgMain" dlg:left="188" dlg:top="92" dlg:width="220" dlg:height="215" dlg:help-text="&amp;2.DlgMain.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;3.DlgMain.Title">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgMain" dlg:left="100" dlg:top="100" dlg:width="220" dlg:height="230" dlg:help-text="&amp;2.DlgMain.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;3.DlgMain.Title">
  <dlg:styles>
-  <dlg:style dlg:style-id="0" dlg:background-color="0xff0000" dlg:text-color="0xffffff" dlg:font-weight="100"/>
-  <dlg:style dlg:style-id="1" dlg:background-color="0xff" dlg:text-color="0xffffff"/>
-  <dlg:style dlg:style-id="2" dlg:background-color="0xffff00"/>
-  <dlg:style dlg:style-id="3" dlg:border="none"/>
+  <dlg:style dlg:style-id="0" dlg:border="none"/>
+  <dlg:style dlg:style-id="1" dlg:background-color="0xff0000" dlg:text-color="0xffffff" dlg:font-weight="100"/>
+  <dlg:style dlg:style-id="2" dlg:background-color="0xff" dlg:text-color="0xffffff"/>
+  <dlg:style dlg:style-id="3" dlg:background-color="0xffff00"/>
  </dlg:styles>
  <dlg:bulletinboard>
   <dlg:text dlg:id="txtPokemon" dlg:tab-index="16" dlg:left="5" dlg:top="21" dlg:width="30" dlg:height="8" dlg:help-text="&amp;22.DlgMain.txtPokemon.HelpText" dlg:value="&amp;23.DlgMain.txtPokemon.Label"/>
@@ -165,6 +165,7 @@
    </dlg:menupopup>
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subLstPokemonSelected?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:menulist>
+  <dlg:img dlg:style-id="0" dlg:id="imgPokemon" dlg:tab-index="26" dlg:left="90" dlg:top="0" dlg:width="30" dlg:height="30" dlg:help-text="&amp;209.DlgMain.imgPokemon.HelpText"/>
   <dlg:text dlg:id="txtCP" dlg:tab-index="17" dlg:left="5" dlg:top="36" dlg:width="15" dlg:height="8" dlg:help-text="&amp;26.DlgMain.txtCP.HelpText" dlg:value="&amp;27.DlgMain.txtCP.Label"/>
   <dlg:numericfield dlg:id="numCP" dlg:tab-index="1" dlg:left="20" dlg:top="34" dlg:width="20" dlg:height="12" dlg:help-text="&amp;28.DlgMain.numCP.HelpText" dlg:decimal-accuracy="0" dlg:value-min="10" dlg:value-max="5000">
    <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subBtnOKCheck?language=Basic&amp;location=application" script:language="Script"/>
@@ -245,33 +246,34 @@
    </dlg:menupopup>
   </dlg:menulist>
   <dlg:checkbox dlg:id="cbxIsNew" dlg:tab-index="5" dlg:left="5" dlg:top="51" dlg:width="210" dlg:height="8" dlg:help-text="&amp;46.DlgMain.cbxIsNew.HelpText" dlg:value="&amp;47.DlgMain.cbxIsNew.Label" dlg:checked="true"/>
-  <dlg:titledbox dlg:id="grpApprasals" dlg:tab-index="21" dlg:left="5" dlg:top="65" dlg:width="210" dlg:height="125" dlg:help-text="&amp;50.DlgMain.grpApprasals.HelpText">
+  <dlg:titledbox dlg:id="grpApprasals" dlg:tab-index="21" dlg:left="5" dlg:top="65" dlg:width="210" dlg:height="140" dlg:help-text="&amp;50.DlgMain.grpApprasals.HelpText">
    <dlg:title dlg:value="&amp;51.DlgMain.grpApprasals.Label"/>
   </dlg:titledbox>
-  <dlg:text dlg:id="txtTeam" dlg:tab-index="22" dlg:left="10" dlg:top="96" dlg:width="20" dlg:height="8" dlg:help-text="&amp;180.DlgMain.txtTeam.HelpText" dlg:value="&amp;181.DlgMain.txtTeam.Label"/>
+  <dlg:img dlg:style-id="0" dlg:id="imgTeamLogo" dlg:tab-index="25" dlg:left="10" dlg:top="75" dlg:width="30" dlg:height="30" dlg:help-text="&amp;204.DlgMain.imgTeamLogo.HelpText"/>
+  <dlg:text dlg:id="txtTeam" dlg:tab-index="22" dlg:left="45" dlg:top="96" dlg:width="20" dlg:height="8" dlg:help-text="&amp;180.DlgMain.txtTeam.HelpText" dlg:value="&amp;181.DlgMain.txtTeam.Label"/>
   <dlg:radiogroup>
-   <dlg:radio dlg:style-id="0" dlg:id="rdoTeamRed" dlg:tab-index="6" dlg:left="30" dlg:top="96" dlg:width="25" dlg:height="8" dlg:help-text="&amp;182.DlgMain.rdoTeamRed.HelpText" dlg:value="&amp;183.DlgMain.rdoTeamRed.Label">
+   <dlg:radio dlg:style-id="1" dlg:id="rdoTeamRed" dlg:tab-index="6" dlg:left="65" dlg:top="96" dlg:width="25" dlg:height="8" dlg:help-text="&amp;182.DlgMain.rdoTeamRed.HelpText" dlg:value="&amp;183.DlgMain.rdoTeamRed.Label">
     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subRdoTeamRedItemChanged_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
    </dlg:radio>
-   <dlg:radio dlg:style-id="1" dlg:id="rdoTeamBlue" dlg:tab-index="7" dlg:left="60" dlg:top="96" dlg:width="30" dlg:height="8" dlg:help-text="&amp;184.DlgMain.rdoTeamBlue.HelpText" dlg:value="&amp;185.DlgMain.rdoTeamBlue.Label">
+   <dlg:radio dlg:style-id="2" dlg:id="rdoTeamBlue" dlg:tab-index="7" dlg:left="95" dlg:top="96" dlg:width="30" dlg:height="8" dlg:help-text="&amp;184.DlgMain.rdoTeamBlue.HelpText" dlg:value="&amp;185.DlgMain.rdoTeamBlue.Label">
     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subRdoTeamBlueItemChanged_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
    </dlg:radio>
-   <dlg:radio dlg:style-id="2" dlg:id="rdoTeamYellow" dlg:tab-index="8" dlg:left="95" dlg:top="96" dlg:width="30" dlg:height="8" dlg:help-text="&amp;186.DlgMain.rdoTeamYellow.HelpText" dlg:value="&amp;187.DlgMain.rdoTeamYellow.Label">
+   <dlg:radio dlg:style-id="3" dlg:id="rdoTeamYellow" dlg:tab-index="8" dlg:left="130" dlg:top="96" dlg:width="30" dlg:height="8" dlg:help-text="&amp;186.DlgMain.rdoTeamYellow.HelpText" dlg:value="&amp;187.DlgMain.rdoTeamYellow.Label">
     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subRdoTeamYellowItemChanged_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
    </dlg:radio>
   </dlg:radiogroup>
-  <dlg:img dlg:style-id="3" dlg:id="imgTeam" dlg:tab-index="25" dlg:left="180" dlg:top="75" dlg:width="30" dlg:height="30" dlg:help-text="&amp;207.DlgMain.imgTeam.HelpText"/>
-  <dlg:menulist dlg:id="lstApprasal1" dlg:tab-index="9" dlg:left="10" dlg:top="109" dlg:width="200" dlg:height="12" dlg:help-text="&amp;164.DlgMain.lstApprasal1.HelpText" dlg:spin="true"/>
-  <dlg:text dlg:id="txtBestBefore" dlg:tab-index="23" dlg:left="10" dlg:top="126" dlg:width="20" dlg:height="8" dlg:help-text="&amp;194.DlgMain.txtBestBefore.HelpText"/>
-  <dlg:menulist dlg:id="lstBest" dlg:tab-index="10" dlg:left="30" dlg:top="124" dlg:width="35" dlg:height="12" dlg:help-text="&amp;193.DlgMain.lstBest.HelpText" dlg:spin="true">
+  <dlg:img dlg:style-id="0" dlg:id="imgTeamLeader" dlg:tab-index="28" dlg:left="10" dlg:top="105" dlg:width="30" dlg:height="35" dlg:help-text="&amp;210.DlgMain.imgTeamLeader.HelpText"/>
+  <dlg:text dlg:id="txtLeaderAppraise" dlg:tab-index="27" dlg:left="45" dlg:top="111" dlg:width="165" dlg:height="8" dlg:help-text="&amp;208.DlgMain.txtLeaderAppraise.HelpText"/>
+  <dlg:menulist dlg:id="lstApprasal1" dlg:tab-index="9" dlg:left="45" dlg:top="124" dlg:width="165" dlg:height="12" dlg:help-text="&amp;164.DlgMain.lstApprasal1.HelpText" dlg:spin="true"/>
+  <dlg:text dlg:id="txtBestBefore" dlg:tab-index="23" dlg:left="45" dlg:top="141" dlg:width="20" dlg:height="8" dlg:help-text="&amp;194.DlgMain.txtBestBefore.HelpText"/>
+  <dlg:menulist dlg:id="lstBest" dlg:tab-index="10" dlg:left="65" dlg:top="139" dlg:width="35" dlg:height="12" dlg:help-text="&amp;193.DlgMain.lstBest.HelpText" dlg:spin="true">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subLstBestItemChanged_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:menulist>
-  <dlg:text dlg:id="txtBestAfter" dlg:tab-index="24" dlg:left="65" dlg:top="126" dlg:width="100" dlg:height="8" dlg:help-text="&amp;195.DlgMain.txtBestAfter.HelpText"/>
-  <dlg:checkbox dlg:id="cbxBest2" dlg:tab-index="11" dlg:left="10" dlg:top="141" dlg:width="200" dlg:height="8" dlg:help-text="&amp;201.DlgMain.cbxBest2.HelpText" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="cbxBest3" dlg:tab-index="12" dlg:left="10" dlg:top="156" dlg:width="200" dlg:height="8" dlg:help-text="&amp;203.DlgMain.cbxBest3.HelpText" dlg:checked="false"/>
-  <dlg:menulist dlg:id="lstApprasal2" dlg:tab-index="13" dlg:left="10" dlg:top="169" dlg:width="200" dlg:height="12" dlg:help-text="&amp;165.DlgMain.lstApprasal2.HelpText" dlg:spin="true"/>
-  <dlg:button dlg:id="btnOK" dlg:tab-index="14" dlg:disabled="true" dlg:left="35" dlg:top="195" dlg:width="60" dlg:height="15" dlg:help-text="&amp;85.DlgMain.btnOK.HelpText" dlg:default="true" dlg:button-type="ok"/>
-  <dlg:button dlg:id="btnCancel" dlg:tab-index="15" dlg:left="125" dlg:top="195" dlg:width="60" dlg:height="15" dlg:help-text="&amp;87.DlgMain.btnCancel.HelpText" dlg:button-type="cancel"/>
-  <dlg:img dlg:style-id="3" dlg:id="imgPokemon" dlg:tab-index="26" dlg:left="90" dlg:top="0" dlg:width="30" dlg:height="30" dlg:help-text="&amp;209.DlgMain.imgPokemon.HelpText"/>
+  <dlg:text dlg:id="txtBestAfter" dlg:tab-index="24" dlg:left="100" dlg:top="141" dlg:width="100" dlg:height="8" dlg:help-text="&amp;195.DlgMain.txtBestAfter.HelpText"/>
+  <dlg:checkbox dlg:id="cbxBest2" dlg:tab-index="11" dlg:left="45" dlg:top="156" dlg:width="165" dlg:height="8" dlg:help-text="&amp;201.DlgMain.cbxBest2.HelpText" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="cbxBest3" dlg:tab-index="12" dlg:left="45" dlg:top="171" dlg:width="165" dlg:height="8" dlg:help-text="&amp;203.DlgMain.cbxBest3.HelpText" dlg:checked="false"/>
+  <dlg:menulist dlg:id="lstApprasal2" dlg:tab-index="13" dlg:left="45" dlg:top="184" dlg:width="165" dlg:height="12" dlg:help-text="&amp;165.DlgMain.lstApprasal2.HelpText" dlg:spin="true"/>
+  <dlg:button dlg:id="btnOK" dlg:tab-index="14" dlg:disabled="true" dlg:left="35" dlg:top="210" dlg:width="60" dlg:height="15" dlg:help-text="&amp;85.DlgMain.btnOK.HelpText" dlg:default="true" dlg:button-type="ok"/>
+  <dlg:button dlg:id="btnCancel" dlg:tab-index="15" dlg:left="125" dlg:top="210" dlg:width="60" dlg:height="15" dlg:help-text="&amp;87.DlgMain.btnCancel.HelpText" dlg:button-type="cancel"/>
  </dlg:bulletinboard>
-</dlg:window>
+</dlg:window>
\ No newline at end of file
diff --git a/oxt/icons/team-leader-blanche.png b/oxt/icons/team-leader-blanche.png
new file mode 100644
index 0000000..09104be
Binary files /dev/null and b/oxt/icons/team-leader-blanche.png differ
diff --git a/oxt/icons/team-leader-candela.png b/oxt/icons/team-leader-candela.png
new file mode 100644
index 0000000..f7d914d
Binary files /dev/null and b/oxt/icons/team-leader-candela.png differ
diff --git a/oxt/icons/team-leader-spark.png b/oxt/icons/team-leader-spark.png
new file mode 100644
index 0000000..40f93cc
Binary files /dev/null and b/oxt/icons/team-leader-spark.png differ
diff --git a/oxt/icons/team-instinct.png b/oxt/icons/team-logo-instinct.png
similarity index 100%
rename from oxt/icons/team-instinct.png
rename to oxt/icons/team-logo-instinct.png
diff --git a/oxt/icons/team-mystic.png b/oxt/icons/team-logo-mystic.png
similarity index 100%
rename from oxt/icons/team-mystic.png
rename to oxt/icons/team-logo-mystic.png
diff --git a/oxt/icons/team-valor.png b/oxt/icons/team-logo-valor.png
similarity index 100%
rename from oxt/icons/team-valor.png
rename to oxt/icons/team-logo-valor.png
diff --git a/oxt/icons/unknown.png b/oxt/icons/unknown.png
new file mode 100644
index 0000000..70778b3
Binary files /dev/null and b/oxt/icons/unknown.png differ