diff --git a/ic_launcher.svg b/ic_launcher.svg
new file mode 100644
index 00000000..9d4176ab
--- /dev/null
+++ b/ic_launcher.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: flash2svg, http://dissentgraphics.com/tools/flash2svg -->
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" id="Tor" image-rendering="optimizeSpeed" baseProfile="basic" version="1.1" style="background-color:#ffffff" x="0px" y="0px" width="1024px" height="1024px" viewBox="0 0 1024 1024" enable-background="new 0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+  <defs transform="matrix(1 0 0 1 0 0) "/>
+  <g id="shadow">
+    <g id="shape">
+      <path id="path" fill="#000000" fill-opacity="0.09803921568627451" d="M969.65,351.3 Q961.05,330.45 950.25,310.45 C946.2,302.9 941.9,295.4 937.35,288.05 917.8,256.35 893.95,226.4 865.8,198.25 773.65,106.1 662.35,60 532,60 401.65,60 290.4,106.1 198.25,198.25 106.1,290.4 60,401.65 60,532 60,662.35 106.1,773.65 198.25,865.8 290.4,957.95 401.65,1004 532,1004 662.35,1004 773.65,957.95 865.8,865.8 916.55,815 953.35,758.4 976.15,696.05 994.7,645.2 1004,590.55 1004,532 1004,487.1 998.55,444.45 987.6,404.05 986.35,399.5 985.05,394.95 983.7,390.45 979.6,377.15 974.9,364.1 969.65,351.3z"/>
+    </g>
+  </g>
+  <g id="bg">
+    <g id="shape2">
+      <path id="path1" fill="#4F3663" fill-opacity="1" d="M969.75,394 C968.65,389.65 967.4,385 966.1,380.4 963.6,371.65 960.75,362.8 957.65,354.05 951.2,335.8 943.5,318 934.5,300.4 930.7,293 926.55,285.45 922.2,278 901.9,243.5 876.4,210.8 845.85,180.25 806.9,141.3 764.5,110.55 718.35,87.9 679.05,68.6 636.9,55.35 592.2,48.2 575.95,45.6 559.4,43.8 542.15,42.85 532.45,42.3 522.3,42 512.05,42 502.7,42 493.45,42.25 484.15,42.75 477.45,43.1 470.8,43.55 464.1,44.2 407.25,49.4 354.3,64 305.15,88.2 259.55,110.6 217.25,141.3 178.3,180.25 89.05,269.5 43,376.75 40.2,501.75 Q40.05,507.85 40.05,514 C40.05,644.35 86.15,755.65 178.3,847.8 263.55,933.05 365.15,978.85 483,985.2 483.35,985.25 483.75,985.25 484.15,985.3 484.3,985.3 484.4,985.3 484.55,985.3 493.05,985.75 501.15,986 509.05,986 510.25,986 511.15,986 512.05,986 522.35,986 532.55,985.7 542.15,985.2 544.65,985.05 546.9,984.9 549.1,984.75 569.3,983.3 589,980.7 607.8,977.05 615.75,975.5 623.6,973.75 631.2,971.9 712,951.6 783.35,910.3 845.85,847.8 851.95,841.7 857.85,835.55 863.35,829.5 903.2,785.65 933.1,737.9 953.2,686 962.3,662.55 969.35,638.25 974.5,612.95 979.7,587.15 982.8,560.3 983.75,532.5 983.95,526.45 984.05,520.25 984.05,514 984.05,513.35 984.05,512.65 984.05,512 984.05,511.65 984.05,511.35 984.05,511 984.05,507.9 984,504.8 983.95,501.65 983.1,464.45 978.4,428.65 969.75,394z"/>
+    </g>
+  </g>
+  <g id="bg1">
+    <g id="shape4">
+      <path id="path2" fill="#000000" fill-opacity="0.2" d="M974.5,612.95 C977.85,596.3 980.35,579.25 981.95,561.65 L589.25,168.95 558.05,199 489.375,130.325 456.05,212.05 507.525,263.525 290.5,850.05 417.8,977.35 C439.25,981.4 460.85,984 483,985.2 483.35,985.25 483.75,985.25 484.15,985.3 484.3,985.3 484.4,985.3 484.55,985.3 493.05,985.75 501.15,986 509.05,986 Q510.55,986 512.05,986 C522.35,986 532.55,985.7 542.15,985.2 544.65,985.05 546.9,984.9 549.1,984.75 569.3,983.3 589,980.7 607.8,977.05 615.75,975.5 623.6,973.75 631.2,971.9 712,951.6 783.35,910.3 845.85,847.8 851.95,841.7 857.85,835.55 863.35,829.5 903.2,785.65 933.1,737.9 953.2,686 962.3,662.55 969.35,638.25 974.5,612.95z"/>
+    </g>
+  </g>
+  <g id="Calque.__208">
+    <g id="shape6">
+      <path id="path3" fill="#FDFCDF" fill-opacity="1" d="M433.05,252.05 L433.05,265.45 C431.35,307.5 413.05,338.25 378.2,357.65 375.15,359.1 372.1,360.65 369.05,362.3 342.3,376.5 317.35,395.15 294.25,418.25 234.1,478.4 204.05,551 204.05,636.05 204.05,721.1 234.1,793.7 294.25,853.85 354.4,914 427,944.05 512.05,944.05 513.5,944.05 514.95,944.05 516.15,944.05 L516.15,944.025 L516.15,879.625 L516.15,879.65 C514.8,879.65 513.4,879.65 512.05,879.65 447.2,879.65 391.85,856.7 346,810.85 300.15,765 277.25,709.7 277.25,644.85 277.25,580 300.15,524.65 346,478.8 391.85,432.95 447.2,410.05 512.05,410.05 513.4,410.05 514.8,410.05 516.15,410.1 L516.15,410.075 L516.15,265.625 L516.15,265.65 C487.45,263.45 459.75,257.85 433.05,252.05z"/>
+      <path id="path4" fill="#EAEACE" fill-opacity="1" d="M516.15,410.1 C514.8,410.05 513.4,410.05 512.05,410.05 447.2,410.05 391.85,432.95 346,478.8 300.15,524.65 277.25,580 277.25,644.85 277.25,709.7 300.15,765 346,810.85 391.85,856.7 447.2,879.65 512.05,879.65 513.4,879.65 514.8,879.65 516.15,879.65 L516.15,879.625 L516.15,809.65 C515.75,809.7 515.35,809.7 514.9,809.7 513.95,809.7 513,809.7 512.05,809.7 504.55,809.7 497.25,809.25 490.15,808.4 485.05,807.75 480.05,806.9 475.1,805.8 445.95,799.3 420.15,784.8 397.6,762.25 366,730.65 350.2,692.5 350.2,647.85 350.2,603.1 366,564.95 397.6,533.3 420.15,510.85 445.95,496.35 475.1,489.9 480.05,488.8 485.05,487.95 490.15,487.3 497.25,486.4 504.55,485.95 512.05,485.95 513,485.95 513.95,485.95 514.9,485.95 515.35,485.95 515.75,485.95 516.15,486 L516.15,485.975 L516.15,410.075"/>
+      <path id="path5" fill="#735A93" fill-opacity="1" d="M820.05,636.05 Q820.05,508.45 729.85,418.25 C706,394.4 680.15,375.25 652.05,360.7 613.9,343.05 593.6,310.2 591.05,262.05 565.35,266.9 540.4,267.45 516.15,265.65 L516.15,265.625 L516.15,410.075 516.15,485.975 516.15,556.35 516.15,743.675 516.15,809.65 516.15,879.625 516.15,944.025 L516.15,944.05 C599.6,943.05 670.75,912.95 729.85,853.85 790,793.7 820.05,721.1 820.05,636.05z"/>
+      <path id="path6" fill="#D1D1B8" fill-opacity="1" d="M512.05,485.95 C504.55,485.95 497.25,486.4 490.15,487.3 485.05,487.95 480.05,488.8 475.1,489.9 445.95,496.35 420.15,510.85 397.6,533.3 366,564.95 350.2,603.1 350.2,647.85 350.2,692.5 366,730.65 397.6,762.25 420.15,784.8 445.95,799.3 475.1,805.8 480.05,806.9 485.05,807.75 490.15,808.4 497.25,809.25 504.55,809.7 512.05,809.7 513,809.7 513.95,809.7 514.9,809.7 515.35,809.7 515.75,809.7 516.15,809.65 L516.15,743.675 L516.15,743.7 C515.6,743.7 515,743.7 514.4,743.75 514.2,743.75 513.95,743.75 513.7,743.75 513.15,743.75 512.6,743.75 512.05,743.75 507.7,743.75 503.5,743.5 499.35,743 499.2,743 499.1,743 498.95,742.95 496.1,742.6 493.35,742.1 490.65,741.55 484.25,740.1 478.15,738 472.3,735.25 462.7,730.7 453.85,724.4 445.75,716.3 427.45,698 418.3,675.9 418.3,650.05 418.3,624.1 427.45,602 445.75,583.7 453.85,575.65 462.7,569.35 472.3,564.8 478.15,562.05 484.25,559.95 490.65,558.55 493.35,557.95 496.1,557.45 498.95,557.1 499.1,557.05 499.2,557.05 499.35,557.05 503.5,556.5 507.7,556.25 512.05,556.25 512.6,556.25 513.15,556.25 513.7,556.25 513.95,556.25 514.2,556.25 514.4,556.3 515,556.3 515.6,556.3 516.15,556.35 L516.15,485.975 L516.15,486 C515.75,485.95 515.35,485.95 514.9,485.95 513.95,485.95 513,485.95 512.05,485.95z"/>
+      <path id="path7" fill="#BFBFA9" fill-opacity="1" d="M512.05,556.25 C507.7,556.25 503.5,556.5 499.35,557.05 499.2,557.05 499.1,557.05 498.95,557.1 496.1,557.45 493.35,557.95 490.65,558.55 484.25,559.95 478.15,562.05 472.3,564.8 462.7,569.35 453.85,575.65 445.75,583.7 427.45,602 418.3,624.1 418.3,650.05 418.3,675.9 427.45,698 445.75,716.3 453.85,724.4 462.7,730.7 472.3,735.25 478.15,738 484.25,740.1 490.65,741.55 493.35,742.1 496.1,742.6 498.95,742.95 499.1,743 499.2,743 499.35,743 503.5,743.5 507.7,743.75 512.05,743.75 512.6,743.75 513.15,743.75 513.7,743.75 513.95,743.75 514.2,743.75 514.4,743.75 515,743.7 515.6,743.7 516.15,743.7 L516.15,743.675 L516.15,556.35 C515.6,556.3 515,556.3 514.4,556.3 514.2,556.25 513.95,556.25 513.7,556.25 513.15,556.25 512.6,556.25 512.05,556.25z"/>
+    </g>
+  </g>
+  <g id="Calque.__209">
+    <g id="shape13">
+      <path id="path8" fill="#78AF52" fill-opacity="1" d="M443.4,84.35 C443.05,85.65 442.7,86.95 442.45,88.05 Q411.45,209.9 507.6,249.75 C526.35,187.5 506.65,133.75 448.25,88.05 446.85,86.95 445.15,85.65 443.4,84.35z"/>
+      <path id="path9" fill="#78AF52" fill-opacity="1" d="M524.35,249.75 C518.9,208.95 540.6,181.85 589.25,168.95 583.95,213.85 562.35,240.75 524.35,249.75"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/res/drawable-hdpi-v11/ic_stat_tor.png b/res/drawable-hdpi-v11/ic_stat_tor.png
index 1182cb51..b4d2e333 100644
Binary files a/res/drawable-hdpi-v11/ic_stat_tor.png and b/res/drawable-hdpi-v11/ic_stat_tor.png differ
diff --git a/res/drawable-hdpi-v11/ic_stat_tor_xfer.png b/res/drawable-hdpi-v11/ic_stat_tor_xfer.png
index a8cfda79..3d757218 100644
Binary files a/res/drawable-hdpi-v11/ic_stat_tor_xfer.png and b/res/drawable-hdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index e4887e71..e9954eb7 100644
Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ
diff --git a/res/drawable-hdpi/ic_stat_tor.png b/res/drawable-hdpi/ic_stat_tor.png
index 654af922..0f3b147e 100644
Binary files a/res/drawable-hdpi/ic_stat_tor.png and b/res/drawable-hdpi/ic_stat_tor.png differ
diff --git a/res/drawable-hdpi/ic_stat_tor_xfer.png b/res/drawable-hdpi/ic_stat_tor_xfer.png
new file mode 100644
index 00000000..d222fb67
Binary files /dev/null and b/res/drawable-hdpi/ic_stat_tor_xfer.png differ
diff --git a/res/drawable-mdpi-v11/ic_stat_tor.png b/res/drawable-mdpi-v11/ic_stat_tor.png
index 9798cb13..a34840dc 100644
Binary files a/res/drawable-mdpi-v11/ic_stat_tor.png and b/res/drawable-mdpi-v11/ic_stat_tor.png differ
diff --git a/res/drawable-mdpi-v11/ic_stat_tor_xfer.png b/res/drawable-mdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 00000000..fe291e76
Binary files /dev/null and b/res/drawable-mdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
index 2ed1f967..e45ce29a 100644
Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ
diff --git a/res/drawable-mdpi/ic_stat_tor.png b/res/drawable-mdpi/ic_stat_tor.png
index bf190955..6649e14a 100644
Binary files a/res/drawable-mdpi/ic_stat_tor.png and b/res/drawable-mdpi/ic_stat_tor.png differ
diff --git a/res/drawable-mdpi/ic_stat_tor_xfer.png b/res/drawable-mdpi/ic_stat_tor_xfer.png
new file mode 100644
index 00000000..73ab2330
Binary files /dev/null and b/res/drawable-mdpi/ic_stat_tor_xfer.png differ
diff --git a/res/drawable-xhdpi-v11/ic_stat_tor.png b/res/drawable-xhdpi-v11/ic_stat_tor.png
index 4f070873..e742ae7b 100644
Binary files a/res/drawable-xhdpi-v11/ic_stat_tor.png and b/res/drawable-xhdpi-v11/ic_stat_tor.png differ
diff --git a/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png b/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 00000000..27e86725
Binary files /dev/null and b/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index d2aac936..13ee02bc 100644
Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/res/drawable-xhdpi/ic_stat_tor.png b/res/drawable-xhdpi/ic_stat_tor.png
index 0c38bd89..11254d2b 100644
Binary files a/res/drawable-xhdpi/ic_stat_tor.png and b/res/drawable-xhdpi/ic_stat_tor.png differ
diff --git a/res/drawable-xhdpi/ic_stat_tor_xfer.png b/res/drawable-xhdpi/ic_stat_tor_xfer.png
new file mode 100644
index 00000000..522d6530
Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_tor_xfer.png differ
diff --git a/res/drawable-xxhdpi-v11/ic_stat_tor.png b/res/drawable-xxhdpi-v11/ic_stat_tor.png
new file mode 100644
index 00000000..1451c505
Binary files /dev/null and b/res/drawable-xxhdpi-v11/ic_stat_tor.png differ
diff --git a/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png b/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 00000000..59e63d4d
Binary files /dev/null and b/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png
index 6182ce43..c2f2f45d 100644
Binary files a/res/drawable-xxhdpi/ic_launcher.png and b/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/res/drawable-xxhdpi/ic_stat_tor.png b/res/drawable-xxhdpi/ic_stat_tor.png
new file mode 100644
index 00000000..778cc1e2
Binary files /dev/null and b/res/drawable-xxhdpi/ic_stat_tor.png differ
diff --git a/res/drawable-xxhdpi/ic_stat_tor_xfer.png b/res/drawable-xxhdpi/ic_stat_tor_xfer.png
new file mode 100644
index 00000000..eb8809c4
Binary files /dev/null and b/res/drawable-xxhdpi/ic_stat_tor_xfer.png differ
diff --git a/res/drawable-xxxhdpi-v11/ic_stat_tor.png b/res/drawable-xxxhdpi-v11/ic_stat_tor.png
new file mode 100644
index 00000000..a78d2907
Binary files /dev/null and b/res/drawable-xxxhdpi-v11/ic_stat_tor.png differ
diff --git a/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png b/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 00000000..30fe5893
Binary files /dev/null and b/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/res/drawable-xxxhdpi/ic_launcher.png
index 501cd324..74a31304 100644
Binary files a/res/drawable-xxxhdpi/ic_launcher.png and b/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/res/drawable-xxxhdpi/ic_stat_tor.png b/res/drawable-xxxhdpi/ic_stat_tor.png
new file mode 100644
index 00000000..a2ff338a
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_stat_tor.png differ
diff --git a/res/drawable-xxxhdpi/ic_stat_tor_xfer.png b/res/drawable-xxxhdpi/ic_stat_tor_xfer.png
new file mode 100644
index 00000000..8f967793
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_stat_tor_xfer.png differ
diff --git a/res/drawable/ic_launcher.png b/res/drawable/ic_launcher.png
new file mode 100644
index 00000000..ea473739
Binary files /dev/null and b/res/drawable/ic_launcher.png differ
diff --git a/res/drawable/ic_stat_tor_xfer.png b/res/drawable/ic_stat_tor_xfer.png
index a8cfda79..73ab2330 100644
Binary files a/res/drawable/ic_stat_tor_xfer.png and b/res/drawable/ic_stat_tor_xfer.png differ
diff --git a/res/drawable/oldtoroff.png b/res/drawable/oldtoroff.png
new file mode 100644
index 00000000..4b23e0b3
Binary files /dev/null and b/res/drawable/oldtoroff.png differ
diff --git a/res/drawable/oldtoron.png b/res/drawable/oldtoron.png
new file mode 100644
index 00000000..a99bec1c
Binary files /dev/null and b/res/drawable/oldtoron.png differ
diff --git a/res/drawable/oldtorstarting.png b/res/drawable/oldtorstarting.png
new file mode 100644
index 00000000..a56844a9
Binary files /dev/null and b/res/drawable/oldtorstarting.png differ
diff --git a/res/drawable/toroff.png b/res/drawable/toroff.png
index 4b23e0b3..a72790bb 100644
Binary files a/res/drawable/toroff.png and b/res/drawable/toroff.png differ
diff --git a/res/drawable/toron.png b/res/drawable/toron.png
index a99bec1c..6f9c7348 100644
Binary files a/res/drawable/toron.png and b/res/drawable/toron.png differ
diff --git a/res/drawable/torstarting.png b/res/drawable/torstarting.png
index a56844a9..134d8d7c 100644
Binary files a/res/drawable/torstarting.png and b/res/drawable/torstarting.png differ
diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml
index a0fc1a66..140c4a9a 100644
--- a/res/layout/layout_main.xml
+++ b/res/layout/layout_main.xml
@@ -4,14 +4,12 @@
      xmlns:android="http://schemas.android.com/apk/res/android"
      android:orientation="vertical" android:layout_width="match_parent"
       android:layout_height="match_parent"
-                android:background="@color/panel_background_main"
       
       >
       
     <android.support.v7.widget.Toolbar
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
-          android:background="@color/panel_background"
         android:layout_height="?attr/actionBarSize"
     
      />
@@ -39,7 +37,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-          android:background="@color/panel_background_dark"
     
      >
         
@@ -72,7 +69,6 @@
 		      >
 	    <TextView
 	    	android:id="@+id/trafficLabelDown"
-			android:textColor="#FFFFFFFF"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			 android:layout_alignParentLeft="true"
@@ -82,7 +78,6 @@
 			android:fontFamily="sans-serif-light" />
 	    <TextView
 			android:id="@+id/trafficLabelUp"
-			android:textColor="#FFFFFFFF"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			 android:layout_alignParentRight="true"
@@ -103,7 +98,6 @@
 		      >
 		<TextView
 			android:id="@+id/trafficDown"
-			android:textColor="@color/bright_green"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			 android:layout_alignParentLeft="true"
@@ -114,7 +108,6 @@
 		
 		<TextView
 			android:id="@+id/trafficUp"
-			android:textColor="@color/bright_green"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			 android:layout_alignParentRight="true"
@@ -156,7 +149,6 @@ android:layout_gravity="center_horizontal|center_vertical"/>
 		       
 		       	<TextView
 					android:id="@+id/lblStatus"
-					android:textColor="@android:color/white"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:textSize="14sp"
@@ -175,7 +167,6 @@ android:layout_gravity="center_horizontal|center_vertical"/>
 	     android:orientation="horizontal" android:layout_width="match_parent"
 	      android:layout_height="wrap_content"
 	      android:padding="5dp"
-	            android:background="@color/panel_background_dark"
 			android:layout_gravity="bottom"
 	      >
 	
@@ -185,7 +176,6 @@ android:layout_gravity="center_horizontal|center_vertical"/>
 			    android:layout_height="wrap_content"
 			    android:text="@string/menu_verify_browser"
 			    
-          		android:background="@drawable/button"
           		android:layout_margin="3dp"
           		 android:ellipsize="end"
           android:singleLine="true"
@@ -197,8 +187,7 @@ android:layout_gravity="center_horizontal|center_vertical"/>
 			    android:layout_width="80dp"
 			    android:layout_height="wrap_content"
 			    android:textOff="@string/menu_vpn"
-			    android:textOn="@string/menu_vpn"			    
-				android:background="@drawable/toggle"
+			    android:textOn="@string/menu_vpn"	
           android:layout_margin="3dp"
           android:ellipsize="end"
           android:singleLine="true"
@@ -211,7 +200,6 @@ android:layout_gravity="center_horizontal|center_vertical"/>
 			    android:layout_height="wrap_content"
 			    android:textOff="@string/bridges"
 			    android:textOn="@string/bridges"	
-			    android:background="@drawable/toggle"
           		    android:layout_margin="3dp"
           		     android:ellipsize="end"
           android:singleLine="true"
@@ -233,8 +221,6 @@ android:layout_gravity="center_horizontal|center_vertical"/>
      >
     	<TextView
 			android:id="@+id/orbotLog"
-			android:textColor="#00FF00"
-			android:background="#333333"
 			android:textSize="12sp"
 			android:gravity="left"
 			android:layout_width="fill_parent"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3bc14fa4..19e06e79 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,8 +1,8 @@
 
     <resources>
-        <color name="panel_background">#55460072</color>
-        <color name="panel_background_dark">#aa460072</color>
-        <color name="panel_background_main">#460072</color>
+        <color name="panel_background">#ffffff</color>
+        <color name="panel_background_dark">#efefef</color>
+        <color name="panel_background_main">#efefef</color>
         <color name="bright_green">#ccff2a</color>
         <color name="dark_green">#669901</color>
     </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index decd8920..7a4fbc6d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -107,7 +107,7 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot-Enabled Apps</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string>
-  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
+  <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string>
   <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string>
   <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string>
   <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string>
@@ -257,7 +257,7 @@
 
     <string name="permission_manage_tor_label">Manage Tor</string>
     <string name="permission_manage_tor_description">Enable this app to control the Tor service</string>
-    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">It doesn\'t seem like you have Orweb installed. Want help with that, or should we just open the browser?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">It doesn\'t seem like you have Orfox installed. Want help with that, or should we just open the browser?</string>
     <string name="install_apps_">Install apps?</string>
     <string name="no_network_connectivity_putting_tor_to_sleep_">No network connectivity. Putting Tor to sleep…</string>
     <string name="network_connectivity_is_good_waking_tor_up_">Network connectivity is good. Waking Tor up…</string>
@@ -329,7 +329,7 @@
   
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">You can get a bridge address through email, the web or by scanning a bridge QR code. Select \'Email\' or \'Web\' below to request a bridge address.\n\nOnce you have an address, copy &amp; paste it into the \"Bridges\" preference in Orbot\'s setting and restart.</string>
   
-  <string name="install_orweb">Install Orweb</string>
+  <string name="install_orweb">Install Orfox</string>
   
   <string name="standard_browser">Standard Browser</string>
   
diff --git a/res/values/theme.xml b/res/values/theme.xml
index 5f0299d3..4d311776 100644
--- a/res/values/theme.xml
+++ b/res/values/theme.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-	<color name="custom_theme_color">#333</color>
-    <style name="DefaultTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="DefaultTheme" parent="Theme.AppCompat">
         <item name="android:windowNoTitle">true</item>
     </style>
     
     <!-- the theme applied to the application or activity -->
     <style name="CustomActionBarTheme"
-           parent="@style/Theme.AppCompat">
+           parent="Theme.AppCompat">
         <item name="android:windowActionBarOverlay">true</item>
     </style>
 </resources>
diff --git a/web_hi_res_512.png b/web_hi_res_512.png
index 4ee874e4..2f8735c1 100644
Binary files a/web_hi_res_512.png and b/web_hi_res_512.png differ