diff --git a/build.gradle b/build.gradle
index 0defc7f70..67d9409bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,223 +1,245 @@
-buildscript {
-    repositories {
-        maven {
-            url "https://repo1.maven.org/maven2"
-        }
-        // Required for the Gradle plugin
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
-        classpath files('libs/gradle-witness.jar')
-    }
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'witness'
-
-repositories {
-    maven {
-        url "https://repo1.maven.org/maven2/"
-    }
-    google()
-    jcenter()
-    mavenLocal()
-}
-
-subprojects {
-    ext.version_number     = "2.4.0"
-    ext.group_info         = "org.whispersystems"
-    ext.curve25519_version = "0.3.0"
-}
-
-dependencies {
-    def supportVersion = '27.0.0'
-
-    compile "com.android.support:appcompat-v7:$supportVersion"
-    compile "com.android.support:recyclerview-v7:$supportVersion"
-    compile "com.android.support:design:$supportVersion"
-    compile "com.android.support:support-v13:$supportVersion"
-    compile "com.android.support:cardview-v7:$supportVersion"
-    compile "com.android.support:preference-v7:$supportVersion"
-    compile "com.android.support:preference-v14:$supportVersion"
-    compile "com.android.support:gridlayout-v7:$supportVersion"
-    compile ("com.android.support:gridlayout-v7:$supportVersion") {
-        exclude module: 'support-v4'
-    }
-    compile 'com.android.support.constraint:constraint-layout:1.1.3'
-
-    compile 'se.emilsjolander:stickylistheaders:2.7.0'
-    compile 'com.jpardogo.materialtabstrip:library:1.0.9'
-    compile 'info.guardianproject.trustedintents:trustedintents:0.2'
-    compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
-    compile 'com.github.chrisbanes.photoview:library:1.2.3'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.makeramen:roundedimageview:2.1.0'
-    compile 'com.pnikosis:materialish-progress:1.5'
-    compile project (':org.greenrobot.eventbus')
-    compile 'pl.tajchert:waitingdots:0.1.0'
-    compile 'com.melnykov:floatingactionbutton:1.3.0'
-    compile 'com.google.zxing:android-integration:3.1.0'
-    compile ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-
-    compile 'com.squareup.dagger:dagger:1.2.2'
-    annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2'
-    compileOnly 'com.squareup.dagger:dagger-compiler:1.2.2'
-
-    compile ("com.doomonafireball.betterpickers:library:1.5.3") {
-        exclude group: 'com.android.support', module: 'support-v4'
-    }
-
-    compile project (path: ':org.whispersystems.jobmanager')
-    compile project (path: ':org.whispersystems.libpastelog')
-    compile project (path: ':org.whispersystems.libsignal')
-
-    compile 'com.annimon:stream:1.2.1'
-    compile ('com.takisoft.fix:colorpicker:0.9.1') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support', module: 'recyclerview-v7'
-    }
-
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.7'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.8.7'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7'
-    compile 'com.googlecode.libphonenumber:libphonenumber:8.3.3'
-
-    compile project (':com.amulyakhare.textdrawable')
-
-    compile ('com.klinkerapps:android-smsmms:5.1.4')
-
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.assertj:assertj-core:1.7.1'
-    testCompile 'org.mockito:mockito-core:1.9.5'
-    testCompile 'org.powermock:powermock-api-mockito:1.6.1'
-    testCompile 'org.powermock:powermock-module-junit4:1.6.1'
-    testCompile 'org.powermock:powermock-module-junit4-rule:1.6.1'
-    testCompile 'org.powermock:powermock-classloading-xstream:1.6.1'
-
-    androidTestCompile 'com.android.support:multidex:1.0.2'
-    androidTestCompile 'com.android.support:multidex-instrumentation:1.0.2'
-    androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
-    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestCompile ('org.assertj:assertj-core:1.7.1') {
-        exclude group: 'org.hamcrest', module: 'hamcrest-core'
-    }
-    androidTestCompile ('com.squareup.assertj:assertj-android:1.0.0') {
-        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-}
-
-dependencyVerification {
-    verify = [
-            
-    ]
-}
-
-android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.0'
-    useLibrary 'org.apache.http.legacy'
-
-    defaultConfig {
-        versionCode 145
-        versionName "0.15.16"
-
-        minSdkVersion 14
-        targetSdkVersion 26
-
-        vectorDrawables.useSupportLibrary = true
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    packagingOptions {
-        exclude 'LICENSE.txt'
-        exclude 'LICENSE'
-        exclude 'NOTICE'
-        exclude 'asm-license.txt'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
-    }
-
-    signingConfigs {
-        release
-    }
-
-    buildTypes {
-        debug {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
-            testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
-        }
-        release {
-            minifyEnabled true
-            proguardFiles = buildTypes.debug.proguardFiles
-            testProguardFiles = buildTypes.debug.testProguardFiles
-            signingConfig signingConfigs.release
-        }
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-        androidTest {
-            java.srcDirs = ['test/androidTest/java']
-        }
-        test {
-            java.srcDirs = ['test/unitTest/java']
-        }
-    }
-
-     lintOptions {
-        abortOnError false
-    }
-}
-
-tasks.whenTaskAdded { task ->
-    if (task.name.equals("lint")) {
-        task.enabled = false
-    }
-}
-
-def Properties props = new Properties()
-def propFile = new File('signing.properties')
-
-if (propFile.canRead()){
-    props.load(new FileInputStream(propFile))
-
-    if (props !=null &&
-        props.containsKey('STORE_FILE')     &&
-        props.containsKey('STORE_PASSWORD') &&
-        props.containsKey('KEY_ALIAS')      &&
-        props.containsKey('KEY_PASSWORD'))
-    {
-        android.signingConfigs.release.storeFile = file(props['STORE_FILE'])
-        android.signingConfigs.release.storePassword = props['STORE_PASSWORD']
-        android.signingConfigs.release.keyAlias = props['KEY_ALIAS']
-        android.signingConfigs.release.keyPassword = props['KEY_PASSWORD']
-    } else {
-        println 'signing.properties found but some entries are missing'
-        android.buildTypes.release.signingConfig = null
-    }
-}else {
-    println 'signing.properties not found'
-    android.buildTypes.release.signingConfig = null
-}
-
-tasks.withType(JavaCompile){
-    options.warnings = false
-}
+buildscript {
+    repositories {
+        maven {
+            url "https://repo1.maven.org/maven2"
+        }
+        // Required for the Gradle plugin
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath files('libs/gradle-witness.jar')
+    }
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'witness'
+
+repositories {
+    maven {
+        url "https://repo1.maven.org/maven2/"
+    }
+    // JW: added
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/shortcutbadger/releases/"
+        content {
+            includeGroupByRegex "me\\.leolin.*"
+        }
+    }
+    google()
+    jcenter()
+    mavenLocal()
+}
+
+subprojects {
+    ext.version_number     = "2.4.0"
+    ext.group_info         = "org.whispersystems"
+    ext.curve25519_version = "0.3.0"
+}
+
+dependencies {
+    def supportVersion = '27.0.0'
+
+    implementation "me.leolin:ShortcutBadger:1.1.16" // JW: added
+    compile "com.android.support:appcompat-v7:$supportVersion"
+    compile "com.android.support:recyclerview-v7:$supportVersion"
+    compile "com.android.support:design:$supportVersion"
+    compile "com.android.support:support-v13:$supportVersion"
+    compile "com.android.support:cardview-v7:$supportVersion"
+    compile "com.android.support:preference-v7:$supportVersion"
+    compile "com.android.support:preference-v14:$supportVersion"
+    compile "com.android.support:gridlayout-v7:$supportVersion"
+    compile ("com.android.support:gridlayout-v7:$supportVersion") {
+        exclude module: 'support-v4'
+    }
+    compile 'com.android.support.constraint:constraint-layout:1.1.3'
+
+    compile 'se.emilsjolander:stickylistheaders:2.7.0'
+    compile 'com.jpardogo.materialtabstrip:library:1.0.9'
+    compile 'info.guardianproject.trustedintents:trustedintents:0.2'
+    compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
+    compile 'com.github.chrisbanes.photoview:library:1.2.3'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile 'com.makeramen:roundedimageview:2.1.0'
+    compile 'com.pnikosis:materialish-progress:1.5'
+    compile project (':org.greenrobot.eventbus')
+    compile 'pl.tajchert:waitingdots:0.1.0'
+    compile 'com.melnykov:floatingactionbutton:1.3.0'
+    compile 'com.google.zxing:android-integration:3.1.0'
+    compile ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+
+    compile 'com.squareup.dagger:dagger:1.2.2'
+    annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2'
+    compileOnly 'com.squareup.dagger:dagger-compiler:1.2.2'
+
+    compile ("com.doomonafireball.betterpickers:library:1.5.3") {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
+
+    compile project (path: ':org.whispersystems.jobmanager')
+    compile project (path: ':org.whispersystems.libpastelog')
+    compile project (path: ':org.whispersystems.libsignal')
+
+    compile 'com.annimon:stream:1.2.1'
+    compile ('com.takisoft.fix:colorpicker:0.9.1') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'com.android.support', module: 'recyclerview-v7'
+    }
+
+    compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.7'
+    compile 'com.fasterxml.jackson.core:jackson-core:2.8.7'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7'
+    compile 'com.googlecode.libphonenumber:libphonenumber:8.3.3'
+
+    compile project (':com.amulyakhare.textdrawable')
+
+    compile ('com.klinkerapps:android-smsmms:5.1.4')
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.assertj:assertj-core:1.7.1'
+    testCompile 'org.mockito:mockito-core:1.9.5'
+    testCompile 'org.powermock:powermock-api-mockito:1.6.1'
+    testCompile 'org.powermock:powermock-module-junit4:1.6.1'
+    testCompile 'org.powermock:powermock-module-junit4-rule:1.6.1'
+    testCompile 'org.powermock:powermock-classloading-xstream:1.6.1'
+
+    androidTestCompile 'com.android.support:multidex:1.0.2'
+    androidTestCompile 'com.android.support:multidex-instrumentation:1.0.2'
+    androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
+    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestCompile ('org.assertj:assertj-core:1.7.1') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    androidTestCompile ('com.squareup.assertj:assertj-android:1.0.0') {
+        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+}
+
+dependencyVerification {
+    verify = [
+            
+    ]
+}
+
+android {
+    compileSdkVersion 27
+    buildToolsVersion '27.0.0'
+    useLibrary 'org.apache.http.legacy'
+
+    defaultConfig {
+        versionCode 145
+        versionName "0.15.16.0-JW"
+
+        minSdkVersion 14
+        targetSdkVersion 26
+
+        vectorDrawables.useSupportLibrary = true
+
+        /* JW: Add ABI splits */
+        ndk {
+            abiFilters 'armeabi-v7a', 'x86'
+        }
+
+        splits {
+            abi {
+                enable true
+                reset()
+                include 'armeabi-v7a', 'x86'
+                universalApk true
+            }
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    packagingOptions {
+        exclude 'LICENSE.txt'
+        exclude 'LICENSE'
+        exclude 'NOTICE'
+        exclude 'asm-license.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+    }
+
+    signingConfigs {
+        release
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
+            testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
+        }
+        release {
+            minifyEnabled true
+            proguardFiles = buildTypes.debug.proguardFiles
+            testProguardFiles = buildTypes.debug.testProguardFiles
+            signingConfig signingConfigs.release
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+        androidTest {
+            java.srcDirs = ['test/androidTest/java']
+        }
+        test {
+            java.srcDirs = ['test/unitTest/java']
+        }
+    }
+
+     lintOptions {
+        abortOnError false
+    }
+}
+
+tasks.whenTaskAdded { task ->
+    if (task.name.equals("lint")) {
+        task.enabled = false
+    }
+}
+
+def Properties props = new Properties()
+def propFile = new File('signing.properties')
+
+if (propFile.canRead()){
+    props.load(new FileInputStream(propFile))
+
+    if (props !=null &&
+        props.containsKey('STORE_FILE')     &&
+        props.containsKey('STORE_PASSWORD') &&
+        props.containsKey('KEY_ALIAS')      &&
+        props.containsKey('KEY_PASSWORD'))
+    {
+        android.signingConfigs.release.storeFile = file(props['STORE_FILE'])
+        android.signingConfigs.release.storePassword = props['STORE_PASSWORD']
+        android.signingConfigs.release.keyAlias = props['KEY_ALIAS']
+        android.signingConfigs.release.keyPassword = props['KEY_PASSWORD']
+    } else {
+        println 'signing.properties found but some entries are missing'
+        android.buildTypes.release.signingConfig = null
+    }
+}else {
+    println 'signing.properties not found'
+    android.buildTypes.release.signingConfig = null
+}
+
+tasks.withType(JavaCompile){
+    options.warnings = false
+}
diff --git a/res/drawable-hdpi/ic_visibility_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_grey600_24dp.png
new file mode 100644
index 000000000..619b076ea
Binary files /dev/null and b/res/drawable-hdpi/ic_visibility_grey600_24dp.png differ
diff --git a/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png
new file mode 100644
index 000000000..e6bddf2ef
Binary files /dev/null and b/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png differ
diff --git a/res/drawable-hdpi/ic_visibility_off_white_24dp.png b/res/drawable-hdpi/ic_visibility_off_white_24dp.png
new file mode 100644
index 000000000..e03a5d234
Binary files /dev/null and b/res/drawable-hdpi/ic_visibility_off_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_visibility_white_24dp.png b/res/drawable-hdpi/ic_visibility_white_24dp.png
new file mode 100644
index 000000000..d531d666f
Binary files /dev/null and b/res/drawable-hdpi/ic_visibility_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_visibility_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_grey600_24dp.png
new file mode 100644
index 000000000..9d554fe3d
Binary files /dev/null and b/res/drawable-mdpi/ic_visibility_grey600_24dp.png differ
diff --git a/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png
new file mode 100644
index 000000000..08dcac59f
Binary files /dev/null and b/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png differ
diff --git a/res/drawable-mdpi/ic_visibility_off_white_24dp.png b/res/drawable-mdpi/ic_visibility_off_white_24dp.png
new file mode 100644
index 000000000..fb21efe6d
Binary files /dev/null and b/res/drawable-mdpi/ic_visibility_off_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_visibility_white_24dp.png b/res/drawable-mdpi/ic_visibility_white_24dp.png
new file mode 100644
index 000000000..0e8e507f2
Binary files /dev/null and b/res/drawable-mdpi/ic_visibility_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_grey600_24dp.png
new file mode 100644
index 000000000..b121c9ae2
Binary files /dev/null and b/res/drawable-xhdpi/ic_visibility_grey600_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png
new file mode 100644
index 000000000..a666da5cd
Binary files /dev/null and b/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xhdpi/ic_visibility_off_white_24dp.png
new file mode 100644
index 000000000..03d0e65b1
Binary files /dev/null and b/res/drawable-xhdpi/ic_visibility_off_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_visibility_white_24dp.png b/res/drawable-xhdpi/ic_visibility_white_24dp.png
new file mode 100644
index 000000000..a42cab710
Binary files /dev/null and b/res/drawable-xhdpi/ic_visibility_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png
new file mode 100644
index 000000000..503497dda
Binary files /dev/null and b/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png
new file mode 100644
index 000000000..63914559f
Binary files /dev/null and b/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png
new file mode 100644
index 000000000..f88d24ff5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_visibility_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_white_24dp.png
new file mode 100644
index 000000000..987af79f8
Binary files /dev/null and b/res/drawable-xxhdpi/ic_visibility_white_24dp.png differ
diff --git a/res/drawable/info_round.xml b/res/drawable/info_round.xml
index 668eaf3be..044c563d5 100644
--- a/res/drawable/info_round.xml
+++ b/res/drawable/info_round.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="2dp" />
-            <solid android:color="#ff145c95" />
-        </shape>
-    </item>
-
-    <item>
-        <shape>
-            <corners android:radius="2dp" />
-            <solid android:color="#ff2090ea" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="2dp" />
+            <solid android:color="#ff7365ad" />
+        </shape>
+    </item>
+
+    <item>
+        <shape>
+            <corners android:radius="2dp" />
+            <solid android:color="#ff7365ad" />
+        </shape>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index 0828f44f2..52215ae80 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -32,7 +32,40 @@
                       android:layout_marginRight="50dp"
                       android:singleLine="true"
                       android:paddingLeft="10dp"
-                      android:paddingRight="10dp"/>
+                      android:paddingRight="40dp"/>
+
+            <org.smssecure.smssecure.components.AnimatingToggle
+                    android:id="@+id/button_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignRight="@+id/passphrase_edit"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:gravity="center">
+
+                <ImageButton android:id="@+id/passphrase_visibility"
+                             android:src="?ic_visibility"
+                             android:background="@drawable/touch_highlight_background"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:paddingLeft="8dp"
+                             android:paddingRight="8dp"
+                             android:paddingTop="3dp"
+                             android:paddingBottom="3dp"
+                             android:layout_centerVertical="true" />
+
+                <ImageButton android:id="@+id/passphrase_visibility_off"
+                             android:src="?ic_visibility_off"
+                             android:background="@drawable/touch_highlight_background"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:paddingLeft="8dp"
+                             android:paddingRight="8dp"
+                             android:paddingTop="3dp"
+                             android:paddingBottom="3dp"
+                             android:layout_centerVertical="true" />
+
+            </org.smssecure.smssecure.components.AnimatingToggle>
 
             <ImageButton android:id="@+id/ok_button"
                          android:src="?ic_arrow_forward"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7810c697d..a3fb17bcc 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -23,6 +23,9 @@
     <attr name="centered_app_title_color" format="reference|color" />
     <attr name="ic_arrow_forward" format="reference" />
 
+    <attr name="ic_visibility" format="reference" /> <!--  JW: added -->
+    <attr name="ic_visibility_off" format="reference" /> <!--  JW: added -->
+
     <attr name="conversation_background" format="reference|color"/>
     <attr name="conversation_editor_background" format="reference|color"/>
     <attr name="conversation_editor_text_color" format="reference|color"/>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ce85dc422..69aa55c50 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,48 +1,51 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <color name="silence_primary">#ff2090ea</color>
-    <color name="silence_primary_dark">#ff1c7ac5</color>
-    <color name="silence_primary_alpha33">#552090ea</color>
-    <color name="silence_primary_alpha_focus">#882090ea</color>
-
-    <color name="white">#ffffffff</color>
-    <color name="black">#ff000000</color>
-    <color name="gray5">#ffeeeeee</color>
-    <color name="gray10">#ffdddddd</color>
-    <color name="gray12">#ffe0e0e0</color>
-    <color name="gray13">#ffababab</color>
-    <color name="gray20">#ffcccccc</color>
-    <color name="gray27">#ffbbbbbb</color>
-    <color name="gray50">#ff808080</color>
-    <color name="gray65">#ff595959</color>
-    <color name="gray70">#ff4d4d4d</color>
-    <color name="gray78">#ff383838</color>
-    <color name="gray95">#ff111111</color>
-
-    <color name="gray95_transparent50">#7F111111</color>
-
-    <color name="conversation_compose_divider">#32000000</color>
-
-    <color name="conversation_list_item_background_read_light">@color/gray5</color>
-    <color name="conversation_list_item_background_unread_light">#ffffffff</color>
-    <color name="conversation_list_item_background_read_dark">#ff000000</color>
-    <color name="conversation_list_item_background_unread_dark">#ff333333</color>
-
-    <color name="conversation_list_divider_light">#15000000</color>
-    <color name="conversation_list_divider_dark">#22ffffff</color>
-
-    <color name="textsecure_holo_blue_light">#ff33b5e5</color>
-
-    <color name="dark_action_bar">#ff111111</color>
-    <color name="action_mode_status_bar">#ff1f1f1f</color>
-    <color name="touch_highlight">#400099cc</color>
-    <color name="light_button">#33ffffff</color>
-    <color name="light_button_highlight">#66ffffff</color>
-
-    <color name="import_export_item_background_light">#ffeeeeee</color>
-    <color name="import_export_item_background_dark">#ff333333</color>
-    <color name="import_export_item_background_shadow_light">#ffd5d5d5</color>
-    <color name="import_export_item_background_shadow_dark">#ff222222</color>
-    <color name="import_export_touch_highlight_light">#400099cc</color>
-    <color name="import_export_touch_highlight_dark">#40ffffff</color>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <!-- JW: change silence_primary, silence_primary_dark, silence_primary_alpha33,  silence_primary_alpha_focus -->
+    <color name="silence_primary">#ff7365ad</color>
+    <color name="silence_primary_dark">#ff7365ad</color>
+    <color name="silence_primary_alpha33">#b9b2da</color>
+    <color name="silence_primary_alpha_focus">#9575cd</color>
+
+    <color name="white">#ffffffff</color>
+    <color name="black">#ff000000</color>
+    <color name="gray5">#ffeeeeee</color>
+    <color name="gray10">#ffdddddd</color>
+    <color name="gray12">#ffe0e0e0</color>
+    <color name="gray13">#ffababab</color>
+    <color name="gray20">#ffcccccc</color>
+    <color name="gray27">#ffbbbbbb</color>
+    <color name="gray50">#ff808080</color>
+    <color name="gray65">#ff595959</color>
+    <color name="gray70">#ff4d4d4d</color>
+    <color name="gray78">#ff383838</color>
+    <color name="gray95">#ff111111</color>
+
+    <color name="gray95_transparent50">#7F111111</color>
+
+    <color name="conversation_compose_divider">#32000000</color>
+
+    <color name="conversation_list_item_background_read_light">@color/gray5</color>
+    <color name="conversation_list_item_background_unread_light">#ffffffff</color>
+    <color name="conversation_list_item_background_read_dark">#ff000000</color>
+    <color name="conversation_list_item_background_unread_dark">#ff333333</color>
+
+    <color name="conversation_list_divider_light">#15000000</color>
+    <color name="conversation_list_divider_dark">#22ffffff</color>
+
+    <!-- JW: change textsecure_holo_blue_light -->
+    <color name="textsecure_holo_blue_light">#7c4dff</color>
+
+    <color name="dark_action_bar">#ff111111</color>
+    <color name="action_mode_status_bar">#ff1f1f1f</color>
+    <color name="touch_highlight">#400099cc</color>
+    <color name="light_button">#33ffffff</color>
+    <color name="light_button_highlight">#66ffffff</color>
+
+    <color name="import_export_item_background_light">#ffeeeeee</color>
+    <color name="import_export_item_background_dark">#ff333333</color>
+    <color name="import_export_item_background_shadow_light">#ffd5d5d5</color>
+    <color name="import_export_item_background_shadow_dark">#ff222222</color>
+    <!-- JW: change import_export_touch_highlight_light -->
+    <color name="import_export_touch_highlight_light">#b39ddb</color>
+    <color name="import_export_touch_highlight_dark">#40ffffff</color>
+</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8f71da661..cfc793160 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -48,6 +48,10 @@
         <item name="centered_app_title_color">#55000000</item>
         <item name="ic_arrow_forward">@drawable/ic_arrow_forward_light</item>
         <item name="lockscreen_watermark">@drawable/lockscreen_watermark_light</item>
+        <!-- JW: added 3 lines -->
+        <item name="android:windowBackground">@color/gray5</item>
+        <item name="ic_visibility">@drawable/ic_visibility_grey600_24dp</item>
+        <item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item>
     </style>
 
     <style name="Silence.DarkIntroTheme" parent="@style/Theme.AppCompat">
@@ -60,6 +64,9 @@
         <item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
         <item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
         <item name="android:windowBackground">@color/black</item>
+        <!-- JW: added 2 lines -->
+        <item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
+        <item name="ic_visibility_off">@drawable/ic_visibility_off_white_24dp</item>
     </style>
 
     <style name="PopupAnimation" parent="@android:style/Animation">
diff --git a/src/org/smssecure/smssecure/PassphrasePromptActivity.java b/src/org/smssecure/smssecure/PassphrasePromptActivity.java
index 75131106e..9b67d4377 100644
--- a/src/org/smssecure/smssecure/PassphrasePromptActivity.java
+++ b/src/org/smssecure/smssecure/PassphrasePromptActivity.java
@@ -20,6 +20,7 @@
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.RelativeSizeSpan;
@@ -35,6 +36,7 @@
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import org.smssecure.smssecure.components.AnimatingToggle;
 import org.smssecure.smssecure.crypto.InvalidPassphraseException;
 import org.smssecure.smssecure.crypto.MasterSecretUtil;
 import org.smssecure.smssecure.util.DynamicIntroTheme;
@@ -51,7 +53,10 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private DynamicIntroTheme dynamicTheme    = new DynamicIntroTheme();
   private DynamicLanguage   dynamicLanguage = new DynamicLanguage();
 
-  private EditText passphraseText;
+  private EditText        passphraseText;
+  private ImageButton     showButton; // JW: added
+  private ImageButton     hideButton; // JW: added
+  private AnimatingToggle visibilityToggle; // JW: added
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -115,18 +120,37 @@ private void handlePassphrase() {
     }
   }
 
+  // // JW: added
+  private void setPassphraseVisibility(boolean visibility) {
+    int cursorPosition = passphraseText.getSelectionStart();
+    if (visibility) {
+      passphraseText.setInputType(InputType.TYPE_CLASS_TEXT |
+                                  InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+    } else {
+      passphraseText.setInputType(InputType.TYPE_CLASS_TEXT |
+                                  InputType.TYPE_TEXT_VARIATION_PASSWORD);
+    }
+    passphraseText.setSelection(cursorPosition);
+  }
+
   private void initializeResources() {
     getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
     getSupportActionBar().setCustomView(R.layout.centered_app_title);
 
     ImageButton okButton = (ImageButton) findViewById(R.id.ok_button);
-    passphraseText       = (EditText)    findViewById(R.id.passphrase_edit);
+
+    showButton       = (ImageButton)     findViewById(R.id.passphrase_visibility); // JW: added
+    hideButton       = (ImageButton)     findViewById(R.id.passphrase_visibility_off); // JW: added
+    visibilityToggle = (AnimatingToggle) findViewById(R.id.button_toggle); // JW: added
+    passphraseText   = (EditText)        findViewById(R.id.passphrase_edit);
     SpannableString hint = new SpannableString("  " + getString(R.string.PassphrasePromptActivity_enter_passphrase));
     hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
     hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
 
     passphraseText.setHint(hint);
     okButton.setOnClickListener(new OkButtonClickListener());
+    showButton.setOnClickListener(new ShowButtonOnClickListener()); // JW: added
+    hideButton.setOnClickListener(new HideButtonOnClickListener()); // JW: added
     passphraseText.setOnEditorActionListener(new PassphraseActionListener());
     passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock),
                                      EditorInfo.IME_ACTION_DONE);
@@ -158,6 +182,24 @@ public void onClick(View v) {
     }
   }
 
+  // JW: added
+  private class ShowButtonOnClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      visibilityToggle.display(hideButton);
+      setPassphraseVisibility(true);
+    }
+  }
+
+  // JW: added
+  private class HideButtonOnClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      visibilityToggle.display(showButton);
+      setPassphraseVisibility(false);
+    }
+  }
+
   @Override
   protected void cleanup() {
     this.passphraseText.setText("");
diff --git a/src/org/smssecure/smssecure/color/MaterialColor.java b/src/org/smssecure/smssecure/color/MaterialColor.java
index 43c7d4df7..574cc014c 100644
--- a/src/org/smssecure/smssecure/color/MaterialColor.java
+++ b/src/org/smssecure/smssecure/color/MaterialColor.java
@@ -26,6 +26,7 @@ public enum MaterialColor {
   BROWN      (R.color.brown_500,       R.color.brown_700,       R.color.brown_700,       R.color.brown_900,       "brown"),
   GREY       (R.color.grey_500,        R.color.grey_700,        R.color.grey_700,        R.color.grey_900,        "grey"),
   BLUE_GREY  (R.color.blue_grey_500,   R.color.blue_grey_700,   R.color.blue_grey_700,   R.color.blue_grey_900,   "blue_grey"),
+  BLACK      (R.color.black,           R.color.black,           R.color.black,           R.color.black,           "black"),
 
   GROUP      (GREY.conversationColorLight, R.color.silence_primary, R.color.silence_primary_dark,
               GREY.conversationColorDark, R.color.gray95, R.color.black,
diff --git a/src/org/smssecure/smssecure/color/MaterialColors.java b/src/org/smssecure/smssecure/color/MaterialColors.java
index b8f3026c5..889f5fa17 100644
--- a/src/org/smssecure/smssecure/color/MaterialColors.java
+++ b/src/org/smssecure/smssecure/color/MaterialColors.java
@@ -14,25 +14,23 @@ public class MaterialColors {
     MaterialColor.RED,
     MaterialColor.PINK,
     MaterialColor.PURPLE,
-
     MaterialColor.DEEP_PURPLE,
     MaterialColor.INDIGO,
     MaterialColor.BLUE,
-
     MaterialColor.LIGHT_BLUE,
     MaterialColor.CYAN,
     MaterialColor.TEAL,
     MaterialColor.GREEN,
     MaterialColor.LIGHT_GREEN,
-    // Lime
-    // Yellow
-    // Amber
+    MaterialColor.LIME,
+    MaterialColor.YELLOW,
+    MaterialColor.AMBER,
     MaterialColor.ORANGE,
     MaterialColor.DEEP_ORANGE,
-//    MaterialColor.BROWN,
-    MaterialColor.AMBER,
-    // Grey
-    MaterialColor.BLUE_GREY
+    MaterialColor.BROWN,
+    MaterialColor.GREY,
+    MaterialColor.BLUE_GREY,
+    MaterialColor.BLACK
   )));
 
   public static class MaterialColorList {
diff --git a/src/org/smssecure/smssecure/notifications/MessageNotifier.java b/src/org/smssecure/smssecure/notifications/MessageNotifier.java
index 7fcc9f522..da2eb410f 100644
--- a/src/org/smssecure/smssecure/notifications/MessageNotifier.java
+++ b/src/org/smssecure/smssecure/notifications/MessageNotifier.java
@@ -62,6 +62,8 @@
 import java.util.ListIterator;
 import java.util.concurrent.TimeUnit;
 
+import me.leolin.shortcutbadger.ShortcutBadger; // JW
+
 /**
  * Handles posting system notifications for new messages.
  *
@@ -493,6 +495,15 @@ protected Void doInBackground(Void... params) {
 
   private static void updateBadge(Context context, int count) {
     BadgeWidgetProvider.getInstance(context, (Class) ConversationListActivity.class).updateBadge(count);
+    // JW: re-implement badges on icon
+    try {
+      if (count == 0) ShortcutBadger.removeCount(context);
+      else            ShortcutBadger.applyCount(context, count);
+    } catch (Throwable t) {
+      // NOTE :: I don't totally trust this thing, so I'm catching
+      // everything.
+      Log.w("MessageNotifier", t);
+    }
   }
 
 }