diff --git a/shadowsocks-csharp/Data/qrcode.htm b/shadowsocks-csharp/Data/qrcode.htm
index 581f3a11..b5fba382 100644
--- a/shadowsocks-csharp/Data/qrcode.htm
+++ b/shadowsocks-csharp/Data/qrcode.htm
@@ -5,19 +5,19 @@
   __QRCODELIB__
 </script>
 <style>
-    html, body, table, div {
-        padding: 0px;
-        margin: 0 !important;
-    }
-	div#qrcode {
-        margin: 5px !important;
-		text-align: center;
-		vertical-align: center;
-	}
-    #qrcode {
-        width:190px;
-        height:190px;
-    }
+  html, body, table, div {
+      padding: 0px;
+      margin: 0 !important;
+  }
+  div#qrcode {
+    margin: 5px !important;
+	  text-align: center;
+	  vertical-align: center;
+  }
+  #qrcode {
+      width:190px;
+      height:190px;
+  }
 	table {
 		width: 100%;
 		height:100%;
diff --git a/shadowsocks-csharp/View/ConfigForm.cs b/shadowsocks-csharp/View/ConfigForm.cs
index 195d0bc9..51079ed9 100755
--- a/shadowsocks-csharp/View/ConfigForm.cs
+++ b/shadowsocks-csharp/View/ConfigForm.cs
@@ -305,7 +305,9 @@ namespace Shadowsocks.View
 
         private void QRCodeItem_Click(object sender, EventArgs e)
         {
-            new QRCodeForm(controller.GetQRCodeForCurrentServer()).Show();
+            QRCodeForm qrCodeForm = new QRCodeForm(controller.GetQRCodeForCurrentServer());
+            qrCodeForm.Icon = this.Icon;
+            qrCodeForm.Show();
         }
     }
 }
diff --git a/shadowsocks-csharp/View/QRCodeForm.Designer.cs b/shadowsocks-csharp/View/QRCodeForm.Designer.cs
index 0a934d71..151f8922 100755
--- a/shadowsocks-csharp/View/QRCodeForm.Designer.cs
+++ b/shadowsocks-csharp/View/QRCodeForm.Designer.cs
@@ -55,6 +55,7 @@
             this.Controls.Add(this.QRCodeWebBrowser);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
+            this.MinimizeBox = false;
             this.Name = "QRCodeForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Load += new System.EventHandler(this.QRCodeForm_Load);