diff --git a/res/drawable/ic_duckduckgo.png b/res/drawable/ic_duckduckgo.png
new file mode 100644
index 00000000..696dcd6e
Binary files /dev/null and b/res/drawable/ic_duckduckgo.png differ
diff --git a/res/drawable/ic_launcher_gibberbot.png b/res/drawable/ic_launcher_gibberbot.png
index 24835a26..0dadd41c 100644
Binary files a/res/drawable/ic_launcher_gibberbot.png and b/res/drawable/ic_launcher_gibberbot.png differ
diff --git a/res/drawable/ic_twitter.png b/res/drawable/ic_twitter.png
new file mode 100644
index 00000000..1e61c0a2
Binary files /dev/null and b/res/drawable/ic_twitter.png differ
diff --git a/res/drawable/icon_firefox.png b/res/drawable/icon_firefox.png
index 27b0cf48..65d66841 100644
Binary files a/res/drawable/icon_firefox.png and b/res/drawable/icon_firefox.png differ
diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml
index c2a8c020..6bd9be0f 100644
--- a/res/layout/layout_wizard_tips.xml
+++ b/res/layout/layout_wizard_tips.xml
@@ -68,7 +68,7 @@
 
     <Button
         android:id="@+id/WizardRootButtonInstallOrweb"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="left"
         android:layout_marginTop="10px"
@@ -77,7 +77,7 @@
 
     <Button
         android:id="@+id/WizardRootButtonInstallGibberbot"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="left"
         android:layout_marginTop="10px"
@@ -87,16 +87,16 @@
     
     <Button
         android:id="@+id/WizardRootButtonInstallDuckgo"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="left"
         android:layout_marginTop="10px"
-        android:drawableLeft="@drawable/icon_firefox"
+        android:drawableLeft="@drawable/ic_duckduckgo"
         android:text="@string/wizard_tips_duckgo" />
     
     <Button
         android:id="@+id/WizardRootButtonInstallFirefox"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="left"
         android:layout_marginTop="10px"
@@ -105,11 +105,11 @@
     
     <Button
         android:id="@+id/WizardRootButtonInstallTwitter"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="left"
         android:layout_marginTop="10px"
-        android:drawableLeft="@drawable/icon_firefox"
+        android:drawableLeft="@drawable/ic_twitter"
         android:text="@string/wizard_tips_twitter" />
     
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1fe6b816..9590e45e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -97,15 +97,18 @@
     
     
     <string name="wizard_tips_tricks">Orbot-enabled Apps</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_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string>
     <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
     <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
     
-    <string name="wizard_tips_duckgo">Duckduckgo Search Engine app</string>
-   
-    <string name="wizard_tips_firefox">Firefox with Proxy Mobile add-on (extra install after)</string>
-    <string name="wizard_tips_twitter">Twitter supports http proxy "localhost:8118"</string>
-    
+    <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string>
+   	<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+   	
+    <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string>
+    <string name="proxymob_setup_url">http://tinyurl.com/getproxymob</string>
+   	
+    <string name="wizard_tips_twitter">Set Twitter proxy to host "localhost" and port 8118</string>
+    <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
     <string name="wizard_proxy_help_info">Proxy Settings</string>
     <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n
     The host settings is 127.0.0.1 or "localhost". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.
@@ -142,7 +145,9 @@
 	<!-- TipsAndTricks screen -->
 	<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>
 
diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java
index 4aff6094..26cf7ae2 100644
--- a/src/org/torproject/android/wizard/TipsAndTricks.java
+++ b/src/org/torproject/android/wizard/TipsAndTricks.java
@@ -70,9 +70,9 @@ public class TipsAndTricks extends Activity implements TorConstants {
 	    	img.setImageResource(R.drawable.icon);
 	    
 	    	
-        Button btn1 = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot);
+        Button btnLink = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot);
         
-        btn1.setOnClickListener(new OnClickListener() {
+        btnLink.setOnClickListener(new OnClickListener() {
 			
 			public void onClick(View view) {
 
@@ -82,9 +82,9 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			}
 		});
         
-        Button btn2 = (Button)findViewById(R.id.WizardRootButtonInstallOrweb);
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallOrweb);
 
-        btn2.setOnClickListener(new OnClickListener() {
+        btnLink.setOnClickListener(new OnClickListener() {
 			
 			public void onClick(View view) {
 				
@@ -94,6 +94,42 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			}
 		});
         
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallDuckgo);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View view) {
+				
+				String url = getString(R.string.duckgo_apk_url);
+				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+
+			}
+		});
+        
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallFirefox);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View view) {
+				
+				String url = getString(R.string.proxymob_setup_url);
+				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+
+			}
+		});
+        
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallTwitter);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View view) {
+				
+				String url = getString(R.string.twitter_setup_url);
+				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+
+			}
+		});
+        
         
         Button back = ((Button)findViewById(R.id.btnWizard1));
         Button next = ((Button)findViewById(R.id.btnWizard2));