diff --git a/src/com/android/browser/ShareDialog.java b/src/com/android/browser/ShareDialog.java
index a4bfad7..0f44e5c 100644
--- a/src/com/android/browser/ShareDialog.java
+++ b/src/com/android/browser/ShareDialog.java
@@ -88,7 +88,7 @@
 
     public void loadView(final AppAdapter adapter) {
         AlertDialog.Builder builderSingle = new AlertDialog.Builder(activity);
-        builderSingle.setIcon(R.mipmap.ic_launcher_browser_swe);
+        builderSingle.setIcon(R.mipmap.ic_launcher_browser);
         builderSingle.setTitle(activity.getString(R.string.choosertitle_sharevia));
         builderSingle.setAdapter(adapter, new DialogInterface.OnClickListener() {
             @Override
@@ -122,4 +122,4 @@
 
         builderSingle.show();
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/browser/UploadDialog.java b/src/com/android/browser/UploadDialog.java
index a91613e..7505ef7 100644
--- a/src/com/android/browser/UploadDialog.java
+++ b/src/com/android/browser/UploadDialog.java
@@ -65,7 +65,7 @@
                                     R.layout.app_row, this.apps);
 
         AlertDialog.Builder builderSingle = new AlertDialog.Builder(activity);
-        builderSingle.setIcon(R.mipmap.ic_launcher_browser_swe);
+        builderSingle.setIcon(R.mipmap.ic_launcher_browser);
         builderSingle.setTitle(activity.getString(R.string.choose_upload));
 
         builderSingle.setAdapter(adapter, new DialogInterface.OnClickListener() {
@@ -88,4 +88,4 @@
 
         builderSingle.show();
     }
-}
\ No newline at end of file
+}
