diff --git a/res/drawable/ic_launcher_gibberbot.png b/res/drawable/ic_launcher_gibberbot.png
index e4099106..24835a26 100644
Binary files a/res/drawable/ic_launcher_gibberbot.png and b/res/drawable/ic_launcher_gibberbot.png differ
diff --git a/res/drawable/tor.png b/res/drawable/tor.png
index ace86314..0d63dd97 100644
Binary files a/res/drawable/tor.png and b/res/drawable/tor.png differ
diff --git a/res/drawable/warning.png b/res/drawable/warning.png
index 42dc6d66..f5371dce 100644
Binary files a/res/drawable/warning.png and b/res/drawable/warning.png differ
diff --git a/res/layout/layout_wizard_permissions.xml b/res/layout/layout_wizard_permissions.xml
index 1ba5fec1..1327f151 100644
--- a/res/layout/layout_wizard_permissions.xml
+++ b/res/layout/layout_wizard_permissions.xml
@@ -7,23 +7,36 @@
             
 <RelativeLayout 
 	android:layout_width="fill_parent" 
-	android:layout_height="wrap_content" 
+	android:layout_height="70sp" 
 	android:id="@+id/relativeLayout1" 
-	android:layout_gravity="center_horizontal"
-	android:background="#000000">
-        
-        <TextView android:textSize="10pt" 
+	android:layout_gravity="center_vertical|center_horizontal"
+	android:background="#000000"
+	>
+        <ImageView 
+        	android:src="@drawable/icon" 
+        	android:id="@+id/orbot_image" 
+        	android:layout_width="wrap_content" 
+        	android:layout_height="wrap_content" 
+        	android:layout_alignParentLeft="true"
+        	android:paddingLeft="20sp" >
+        </ImageView>
+        <TextView 
         	android:textColor="#FFFFFF"
-        	android:layout_alignParentTop="true"
-       	 	android:layout_height="wrap_content" 
+        	android:textSize="10pt" 
+        	android:layout_toRightOf="@id/orbot_image" 
+        	android:gravity="center_vertical"
+       	 	android:layout_height="fill_parent" 
         	android:id="@+id/WizardTextTitle" 
         	android:layout_width="wrap_content" 
         	android:fadingEdge="vertical" 
-        	android:text="TITLE" 
+        	android:text="TITLE"     
         	android:singleLine="true" 
-          	android:padding="20px" android:layout_centerInParent="true"> 
+        	android:layout_centerInParent="true" 
+        	android:paddingLeft="5sp"
+        	> 
         </TextView>
-    </RelativeLayout>    
+    </RelativeLayout> 
+          
 <TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content">
 
 <TableRow android:layout_margin="10dip" android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent">
@@ -37,9 +50,9 @@
 		 >
 		<LinearLayout android:background="#575757" android:layout_width="wrap_content" android:id="@+id/linearLayout1" android:layout_height="wrap_content" android:orientation="vertical">
 			<TextView android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content"  android:textSize="8pt" android:id="@+id/WizardTextBody1" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView>
-			<Button android:layout_width="wrap_content" android:visibility="gone" android:layout_height="wrap_content" android:gravity="center" android:text="Grant Permission" android:id="@+id/grantPermissions" android:layout_gravity="center"></Button>
-			<TextView android:layout_width="wrap_content" android:visibility="gone" android:textColor="#ffffff" android:layout_height="wrap_content"  android:textSize="8pt" android:id="@+id/WizardTextBody2" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView>
-			<CheckBox android:id="@+id/checkBox" android:layout_gravity="center" android:text="@string/wizard_permissions_consent" android:layout_height="wrap_content" android:layout_width="wrap_content" android:gravity="center" android:visibility="visible"></CheckBox>
+			<Button android:layout_width="wrap_content" android:visibility="gone" android:layout_height="wrap_content" android:gravity="center" android:text="@string/button_grant_superuser" android:id="@+id/grantPermissions" android:layout_gravity="center"></Button>
+			<TextView android:layout_width="wrap_content" android:layout_gravity="left" android:visibility="gone" android:textColor="#ffffff" android:layout_height="wrap_content"  android:textSize="8pt" android:id="@+id/WizardTextBody2" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView>
+			<CheckBox android:id="@+id/checkBox" android:layout_gravity="left" android:text="@string/wizard_permissions_consent" android:layout_height="wrap_content" android:layout_width="wrap_content" android:gravity="center" android:visibility="visible"></CheckBox>
 		</LinearLayout>
 
 		</ScrollView>
diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml
index 17ddb88d..0a7f07b2 100644
--- a/res/layout/layout_wizard_tips.xml
+++ b/res/layout/layout_wizard_tips.xml
@@ -5,24 +5,38 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
             
+
 <RelativeLayout 
 	android:layout_width="fill_parent" 
-	android:layout_height="wrap_content" 
+	android:layout_height="70sp" 
 	android:id="@+id/relativeLayout1" 
-	android:layout_gravity="center_horizontal"
-	android:background="#000000">
-         <TextView android:textSize="10pt" 
+	android:layout_gravity="center_vertical|center_horizontal"
+	android:background="#000000"
+	>
+        <ImageView 
+        	android:src="@drawable/warning" 
+        	android:id="@+id/orbot_image" 
+        	android:layout_width="wrap_content" 
+        	android:layout_height="wrap_content" 
+        	android:layout_alignParentLeft="true"
+        	android:paddingLeft="20sp" >
+        </ImageView>
+        <TextView 
         	android:textColor="#FFFFFF"
-        	android:layout_alignParentTop="true"
-       	 	android:layout_height="wrap_content" 
+        	android:textSize="10pt" 
+        	android:layout_toRightOf="@id/orbot_image" 
+        	android:gravity="center_vertical"
+       	 	android:layout_height="fill_parent" 
         	android:id="@+id/WizardTextTitle" 
         	android:layout_width="wrap_content" 
         	android:fadingEdge="vertical" 
-        	android:text="TITLE" 
+        	android:text="TITLE"     
         	android:singleLine="true" 
-          	android:padding="20px" android:layout_centerInParent="true"> 
+        	android:layout_centerInParent="true" 
+        	android:paddingLeft="5sp"
+        	> 
         </TextView>
-    </RelativeLayout>    
+    </RelativeLayout>   
 <TableLayout  android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content">
 
 <TableRow android:layout_margin="10dip"   android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent">
@@ -43,12 +57,15 @@
 		    >
 		    
 <TextView android:text="@string/wizard_tips_msg" android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content"  android:textSize="8pt" android:id="@+id/WizardTextBody1" android:padding="20dip"></TextView>
+<Button android:text="@string/wizard_tips_orweb"  android:layout_gravity="left" android:drawableLeft="@drawable/icon_orweb" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOrweb" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+
 <Button android:text="@string/wizard_tips_gibberbot"  android:layout_gravity="left" android:drawableLeft="@drawable/ic_launcher_gibberbot"  android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallGibberbot" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 
+<!-- 
 <Button android:text="@string/wizard_tips_firefox"  android:layout_gravity="left" android:drawableLeft="@drawable/icon_firefox" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallFirefox" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 
 <Button android:text="@string/wizard_tips_proxymob" android:layout_marginTop="10px" android:drawableLeft="@drawable/proxymob" android:id="@+id/WizardRootButtonInstallProxyMob" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-
+ -->
 			</LinearLayout>
 		</ScrollView>
 		
diff --git a/res/layout/scrollingtext_buttons_view.xml b/res/layout/scrollingtext_buttons_view.xml
index df599220..815f8642 100644
--- a/res/layout/scrollingtext_buttons_view.xml
+++ b/res/layout/scrollingtext_buttons_view.xml
@@ -8,9 +8,9 @@
             
 <RelativeLayout 
 	android:layout_width="fill_parent" 
-	android:layout_height="wrap_content" 
+	android:layout_height="70sp" 
 	android:id="@+id/relativeLayout1" 
-	android:layout_gravity="center_horizontal"
+	android:layout_gravity="center_vertical|center_horizontal"
 	android:background="#000000"
 	>
         <ImageView 
@@ -19,29 +19,25 @@
         	android:layout_width="wrap_content" 
         	android:layout_height="wrap_content" 
         	android:layout_alignParentLeft="true"
-        	android:paddingLeft="20px" android:layout_marginLeft="10dip" android:layout_marginTop="8dip">
+        	android:paddingLeft="20sp" >
         </ImageView>
         <TextView 
         	android:textColor="#FFFFFF"
         	android:textSize="10pt" 
         	android:layout_toRightOf="@id/orbot_image" 
-        	android:layout_alignParentTop="true"
         	android:gravity="center_vertical"
-       	 	android:layout_height="wrap_content" 
+       	 	android:layout_height="fill_parent" 
         	android:id="@+id/WizardTextTitle" 
         	android:layout_width="wrap_content" 
         	android:fadingEdge="vertical" 
         	android:text="TITLE"     
         	android:singleLine="true" 
-        	
-        	
-        	
         	android:layout_centerInParent="true" 
-        	android:paddingLeft="5px"
-        	android:padding="20px"
+        	android:paddingLeft="5sp"
         	> 
         </TextView>
-    </RelativeLayout>    
+    </RelativeLayout> 
+       
 <TableLayout  android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content" >
 
 <TableRow android:id="@+id/TableRow01"  android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="10dip">
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a4e22a2d..621fc3d7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -14,11 +14,6 @@
 <string name="status_disabled">"تم إيقاف اوربوت</string>
 <string name="status_shutting_down">جاري إغلاق اوربوت</string>
 
-<string name="tor_process_connecting">بدء تور...</string>
-<string name="tor_process_connecting_step2">ضبط التحكم...</string>
-<string name="tor_process_connecting_step3">مكتمل.</string>
-<string name="tor_process_connecting_step4">انتظار.</string>
-
 <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية الى الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام HTTP proxy 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string>
 <string name="menu_home">الصفحة الرئيسية</string>
 <string name="menu_browse">تصفّح</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c6d6321b..e863ec98 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">Orbot està desactivat</string>
 <string name="status_shutting_down">Orbot s\'està aturant</string>
 
-<string name="tor_process_connecting">Iniciant Tor...</string>
-<string name="tor_process_connecting_step2">Preparant el control...</string>
-<string name="tor_process_connecting_step3">acomplert.</string>
-<string name="tor_process_connecting_step4">esperant.</string>
 
 <string name="not_anonymous_yet">ATENCIÓ : El trànsit de la teva connexió ja no es anònim! Siusplau, configura les teves aplicacions per a usar HTTP proxy 127.0.0.1:8118, per SOCKS4A o SOCKS5 proxy 127.0.0.1:9050</string>
 <string name="menu_home">Lloc d\'inici</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 039062b1..2d5a5663 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">"Orbot ist deaktiviert</string>
 <string name="status_shutting_down">Orbot wird beendet</string>
 
-<string name="tor_process_connecting">Starte Tor...</string>
-<string name="tor_process_connecting_step2">Baue Kontrollverbindung auf...</string>
-<string name="tor_process_connecting_step3">erfolgreich abgeschlossen.</string>
-<string name="tor_process_connecting_step4">warte.</string>
 
 <string name="not_anonymous_yet">WARNUNG: Die Verbindung ist noch nicht anonymisiert! Bitte stellen Sie Ihre Programme so ein, dass sie entwederden  HTTP proxy 127.0.0.1:8118, SOCKS4A oder SOCKS proxy 127.0.0.1:9050 nutzen.</string>
 <string name="menu_home">Home</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9b9768de..c588f1c7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">"Orbot está desactivado</string>
 <string name="status_shutting_down">Orbot se está cerrando</string>
 
-<string name="tor_process_connecting">Iniciando Tor...</string>
-<string name="tor_process_connecting_step2">Configurción de control...</string>
-<string name="tor_process_connecting_step3">completo.</string>
-<string name="tor_process_connecting_step4">esperando.</string>
 
 <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Por favor, configure sus aplicaciones para usar el Proxy HTTP 127.0.0.1:8118, el SOCKS4A o el Proxy SOCKS5 127.0.0.1:9050</string>
 <string name="menu_home">Principal</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index cd52e7db..466b02a2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">اوربات غیرفعال شده است.</string>
 <string name="status_shutting_down">اوربات در حال بسته شدن است.</string>
 
-<string name="tor_process_connecting">شروع تُر ...</string>
-<string name="tor_process_connecting_step2">راه اندازی نظارت...</string>
-<string name="tor_process_connecting_step3">كامل شد.</string>
-<string name="tor_process_connecting_step4">در انتظار.</string>
 
 <string name="not_anonymous_yet">هشدار: فعالیت شما هنوز "گمنام" نیست! لطفن اپلیکیشن خود را تنظیم کنید تا از HTTP پروکسی 127.0.0.1:8118 و یا SOCKS4A و یا SOCKS5 پروکسی 127.0.01:9050 استفاده کند.</string>
 <string name="menu_home">خانه</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4d1454d9..c4bf305a 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">"Орбот е дезактивиран</string>
 <string name="status_shutting_down">Орбот се исклучува</string>
 
-<string name="tor_process_connecting">Вклучување на Тор...</string>
-<string name="tor_process_connecting_step2">Воспоставување контрола...</string>
-<string name="tor_process_connecting_step3">готово.</string>
-<string name="tor_process_connecting_step4">чекање.</string>
 
 <string name="not_anonymous_yet">ВНИМАНИЕ: Вашиот сообраќај сеуште не е анонимен! Треба да ги конфигурирате Вашите апликации да го користат проксито за HTTP, 127.0.0.1:8118, или проксито за SOCKS4A или SOCKS5, 127.0.0.1:9050</string>
 <string name="menu_home">Дома</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1bc5d654..5059bf7e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">"Orbot er deaktivert</string>
 <string name="status_shutting_down">Orbot skrur seg av</string>
 
-<string name="tor_process_connecting">Starter Tor...</string>
-<string name="tor_process_connecting_step2">autentiserer kontrolltilkobling...</string>
-<string name="tor_process_connecting_step3">ferdig.</string>
-<string name="tor_process_connecting_step4">venter.</string>
 
 <string name="not_anonymous_yet">ADVARSEL: Trafikken din er ikke anonym helt enda! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5 proxy 127.0.0.1:9050</string>
 <string name="menu_home">Hjem</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1d4dfb4d..28b27fe2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">Orbot is uitgeschakeld</string>
 <string name="status_shutting_down">Orbot is aan het afsluiten</string>
 
-<string name="tor_process_connecting">Bezig met opstarten van Tor...</string>
-<string name="tor_process_connecting_step2">Bezig met instellen aansturing</string>
-<string name="tor_process_connecting_step3">klaar.</string>
-<string name="tor_process_connecting_step4">aan het wachten.</string>
 
 <string name="not_anonymous_yet">WAARSCHUWING: Uw verkeer is nog niet anononiem! Stel uw programma\'s alstublieft in dat ze gebruik maken van HTTP proxy 127.0.0.1:8118 of SOCKS4A of SOCKS5 proxy 127.0.0.1:9050</string>
 <string name="menu_home">Thuis</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7b42d3f3..5925f29e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -14,11 +14,6 @@
 <string name="status_disabled">Orbot wyłączony</string>
 <string name="status_shutting_down">Orbot wyłącza się</string>
 
-<string name="tor_process_connecting">Tor startuje...</string>
-<string name="tor_process_connecting_step2">Ustawianie sterowania...</string>
-<string name="tor_process_connecting_step3">zakończono.</string>
-<string name="tor_process_connecting_step4">oczekiwanie.</string>
-
 <string name="not_anonymous_yet">UWAGA: Twoja komunikacja nie jest jeszcze anonimowa! Proszę skonfiguruj aplikacje aby używały serwera proxy HTTP 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 127.0.0.1:9050</string>
 <string name="menu_home">Start</string>
 <string name="menu_browse">Przeglądaj</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7925730e..d82dac31 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -13,10 +13,6 @@
 <string name="status_disabled">"Orbot está Desactivado</string>
 <string name="status_shutting_down">Orbot a encerrar</string>
 
-<string name="tor_process_connecting">A iniciar Tor...</string>
-<string name="tor_process_connecting_step2">a autenticar a ligação de controlo...</string>
-<string name="tor_process_connecting_step3">completo.</string>
-<string name="tor_process_connecting_step4">a aguardar.</string>
 
 <string name="not_anonymous_yet">ATENÇÃO: A sua ligação ainda não é anónima! Por favor configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
 <string name="menu_home">Início</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1b66df49..67057b5e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">"Orbot Отключен</string>
 <string name="status_shutting_down">Orbot выключается</string>
 
-<string name="tor_process_connecting">Запуск Tor...</string>
-<string name="tor_process_connecting_step2">Настройка управления...</string>
-<string name="tor_process_connecting_step3">готово.</string>
-<string name="tor_process_connecting_step4">ожидание.</string>
 
 <string name="not_anonymous_yet">ВНИМАНИЕ! Ваш поток данных еще не анонимен! Пожалуйста, настройте свои приложения на использование HTTP прокси 127.0.0.1:8118 или SOCKS4A или SOCKS5 прокси 127.0.0.1:9050</string>
 <string name="menu_home">Домашняя страница</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5d5be5b8..97b69253 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">"Orbot är inaktiverad</string>
 <string name="status_shutting_down">Orbot avslutas</string>
 
-<string name="tor_process_connecting">Startar Tor...</string>
-<string name="tor_process_connecting_step2">verifierar kontroll uppkopplingen...</string>
-<string name="tor_process_connecting_step3">klar.</string>
-<string name="tor_process_connecting_step4">väntar.</string>
 
 <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina apps att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
 <string name="menu_home">Hem</string>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 0354e0d4..ebf38ada 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -14,10 +14,6 @@
 <string name="status_disabled">Orbot 已停用</string>
 <string name="status_shutting_down">Orbot 正在关闭</string>
 
-<string name="tor_process_connecting">正在启动Tor....</string>
-<string name="tor_process_connecting_step2">设置控制...</string>
-<string name="tor_process_connecting_step3">完毕。</string>
-<string name="tor_process_connecting_step4">等待中。</string>
 
 <string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器 127.0.0.1:8118 或者 SOCKS4A 或者 SOCKS5 代理服务器 127.0.0.1:9050</string>
 <string name="menu_home">首页</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9befc47..d0d8b892 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,10 +14,9 @@
 <string name="status_disabled">"Orbot is Deactivated</string>
 <string name="status_shutting_down">Orbot is shutting down</string>
 
-<string name="tor_process_connecting">Starting Tor...</string>
-<string name="tor_process_connecting_step2">Setting up control...</string>
-<string name="tor_process_connecting_step3">complete.</string>
-<string name="tor_process_connecting_step4">waiting.</string>
+<string name="tor_process_starting">Starting Tor client...</string>
+<string name="tor_process_complete">complete.</string>
+<string name="tor_process_waiting">waiting.</string>
 
 <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
 <string name="menu_home">Home</string>
@@ -68,7 +67,7 @@
 
 <string name="title_error">Application Error</string>
 
-<string name="wizard_title">Welcome to Orbot</string>
+<string name="wizard_title">Orbot</string>
 
 <string name="wizard_btn_tell_me_more">About Orbot</string>
 <string name="btn_next">Next</string>
@@ -80,7 +79,6 @@
 
 
  <!-- Welcome Wizard strings (DJH) -->
-    <string name="wizard_welcome_msg">Orbot brings Tor to Android. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.\n\n*WARNING:* Simply installing Orbot will _not_ magically anonymize your mobile traffic! This wizard will help you get started.</string>
     <string name="wizard_details">Some Orbot Details</string>
     <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
     <string name="wizard_permissions_root">Permission Granted</string>
@@ -89,7 +87,7 @@
     <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
    
     <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
-    <string name="wizard_permissions_consent">I understand and would like to continue without root</string>
+    <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
    
     <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
     <string name="wizard_configure">Configure Torification</string>
@@ -99,9 +97,8 @@
     
     
     <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-    <string name="wizard_tips_msg">We encourage you to download &amp; use apps that know how to connect directly to Orbot. Click on the buttons below to install.</string>
+    <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string>
     <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-    <string name="wizard_tips_orweb">ORWEB (Android 1.x Only) - Browser designed for privacy &amp; for Orbot</string>
     <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
     
     <string name="wizard_proxy_help_info">Proxy Settings</string>
@@ -112,16 +109,13 @@
     </string>
     
     <string name="wizard_final">Orbot is ready!</string>
-    <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-    
-    <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-    <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+    <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
     
  <!-- END Welcome Wizard strings (DJH) -->
 
-	<string name="connect_first_time"> You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@guardianproject.info to learn more.</string>
+	<string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@guardianproject.info to learn more.</string>
 
-	<string name="tor_check">This will open your default web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
+	<string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
 
 	
     <string name="pref_hs_group">Hidden Services</string>
@@ -131,33 +125,39 @@
     <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
  <!--  New Wizard Strings -->
 	<!-- Title Screen -->
-	<string name="wizard_title_msg">Orbot brings Tor to Android \n\nTor helps you defend against a form of network surveillance that threatens privacy, confidential business activity and relationships, and state security known as traffic analysis</string>
+	<string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
 	<!-- Warning screen -->
 	<string name="wizard_warning_title">Warning</string>
-	<string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nPlease follow the following steps to get started</string>
+	<string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
 	<!-- Permissions screen -->
 	<string name="wizard_permissions_title">Permissions</string>
-	<string name="wizard_permissions_root_msg1">Orbot has detected that you have root permissions enabled. To enable \'Transparent Proxying\', please grant superuser privileges to Orbot</string>
-	<string name="wizard_permissions_root_msg2">If you choose to continue without providing superuser privileges, make sure to use apps made to work with orbot</string>
-	<string name="wizard_permissions_msg">Orbot has detected that you do not have root permissions.\nTransparent Proxying is not possible without superuser privileges.\nMake sure to use apps that have been configured to work with Orbot</string>
+	<string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
+	<string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
+	<string name="wizard_permissions_no_root_msg">Your device is running in standard mode, and does not support root or \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
 	<!-- TipsAndTricks screen -->
-	<string name="wizard_tips_title">Orbot configured Apps</string>
-	<string name="wizard_tips_gibberbot">Gibberbot - Secure instant messaging client for Android</string>
+	<string name="wizard_tips_title">Orbot-Enabled Apps</string>
+	<string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+	<string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+
+	<string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
+	<string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+
+<!-- 
 	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
-	<string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
     <!-- Transparent Proxy screen -->
-    <string name="wizard_transproxy_title">Transparent Proxy</string>
-    <string name="wizard_transproxy_msg">Transparent Proxying allows you to redirect client requests without any special configuration or knowledge at the client.</string>
+    <string name="wizard_transproxy_title">Transparent Proxying</string>
+    <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
     <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
     <string name="wizard_transproxy_none">None</string>
 
  <string name="pref_transparent_tethering_title">Tor Tethering</string>
 	<string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices</string>
    
-   
+<string name="button_grant_superuser">Request Superuser Access</string>
 <string name="pref_select_apps">Select Apps</string>
 <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
 
@@ -167,4 +167,21 @@
 <string name="pref_entrance_node">Entrance Nodes</string>
 <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
 <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+
+<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
+
+
+<string name="pref_proxy_type_title">Proxy Type</string>
+<string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+<string name="pref_proxy_type_dialog">Enter Proxy Type</string>
+
+<string name="pref_proxy_host_title">Proxy Host</string>
+<string name="pref_proxy_host_summary">Proxy server hostname</string>
+<string name="pref_proxy_host_dialog">Enter Proxy Host</string>
+
+<string name="pref_proxy_port_title">Proxy Port</string>
+<string name="pref_proxy_port_summary">Proxy server port</string>
+<string name="pref_proxy_port_dialog">Enter Proxy port</string>
+
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index a6c0f678..8416e018 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -14,6 +14,14 @@ android:key="has_root"
 android:title="@string/pref_has_root"
 android:summary="@string/pref_has_root_summary"
 android:enabled="true"/>
+<!-- 
+<CheckBoxPreference 
+android:defaultValue="false" 
+android:key="use_whispercore"
+android:title="@string/pref_use_whispercore"
+android:summary="@string/pref_use_whispercore_summary"
+android:enabled="true"/>
+ -->
 </PreferenceCategory>
 
 <PreferenceCategory android:title="@string/pref_trans_proxy_group">
@@ -137,6 +145,24 @@ android:dialogTitle="Enter ports"
 <EditTextPreference android:key="pref_hs_hostname" android:summary="the addressable name for your hidden service (generated automatically)" android:title=".Onion Hostname"></EditTextPreference>
 </PreferenceCategory>
 
+<PreferenceCategory android:title="Proxy Service">
+<EditTextPreference android:key="pref_proxy_type"
+android:title="@string/pref_proxy_type_title"
+android:summary="@string/pref_proxy_type_summary"
+android:dialogTitle="@string/pref_proxy_type_dialog"
+/>
+<EditTextPreference android:key="pref_proxy_host"
+android:title="@string/pref_proxy_host_title"
+android:summary="@string/pref_proxy_host_summary"
+android:dialogTitle="@string/pref_proxy_host_dialog"
+/>
+<EditTextPreference android:key="pref_proxy_port"
+android:title="@string/pref_proxy_port_title"
+android:summary="@string/pref_proxy_port_summary"
+android:dialogTitle="@string/pref_proxy_port_dialog"
+/>
+</PreferenceCategory>
+
 <PreferenceCategory android:title="Debug">
 <CheckBoxPreference
 android:key="pref_enable_logging"