diff --git a/app/src/main/java/com/tangem/data/network/ServerURL.java b/app/src/main/java/com/tangem/data/network/ServerURL.java
index 3911f7ed5d..14898c2f12 100644
--- a/app/src/main/java/com/tangem/data/network/ServerURL.java
+++ b/app/src/main/java/com/tangem/data/network/ServerURL.java
@@ -4,6 +4,6 @@ class ServerURL {
     static final String API_TANGEM = "https://verify.tangem.com/";
     static final String API_COINMARKETCAP = "https://api.coinmarketcap.com/";
     static final String API_INFURA = "https://mainnet.infura.io/";
-    static final String API_ESTIMATEFEE = " https://estimatefee.com/";
+    static final String API_ESTIMATEFEE = "https://estimatefee.com/";
     static final String API_UPDATE_VERSION = "https://raw.githubusercontent.com/";
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_content_copy_black_24dp.xml b/app/src/main/res/drawable/ic_content_copy_black_24dp.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/ic_nfc_white_24dp.xml b/app/src/main/res/drawable/ic_nfc_white_24dp.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/ic_wrench_white_24dp.xml b/app/src/main/res/drawable/ic_wrench_white_24dp.xml
old mode 100755
new mode 100644
diff --git a/gradlew b/gradlew
old mode 100755
new mode 100644
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/App.java b/tangemcard/src/main/java/com/tangem/tangemcard/App.java
deleted file mode 100644
index c18cd9cea7..0000000000
--- a/tangemcard/src/main/java/com/tangem/tangemcard/App.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.tangem.tangemcard;
-
-import android.support.v7.app.AppCompatDelegate;
-
-import com.tangem.tangemcard.di.DaggerNetworkComponent;
-import com.tangem.tangemcard.di.NetworkComponent;
-
-public class App {
-    public App() {
-        super();
-    }
-
-    static {
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
-        networkComponent = DaggerNetworkComponent.create();
-    }
-
-    private static NetworkComponent networkComponent;
-
-    public static NetworkComponent getNetworkComponent() {
-        return networkComponent;
-    }
-
-}
\ No newline at end of file
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/Test.java b/tangemcard/src/main/java/com/tangem/tangemcard/Test.java
deleted file mode 100644
index 3d2329b2c4..0000000000
--- a/tangemcard/src/main/java/com/tangem/tangemcard/Test.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.tangem.tangemcard;
-
-public class Test {
-}
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerApiTangem.java b/tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerApiTangem.java
index 92a9557ae1..4fecffb7c2 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerApiTangem.java
+++ b/tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerApiTangem.java
@@ -3,7 +3,6 @@ package com.tangem.tangemcard.data.network;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
-import com.tangem.tangemcard.App;
 import com.tangem.tangemcard.data.TangemCard;
 import com.tangem.tangemcard.data.network.model.CardVerifyAndGetInfo;
 import com.tangem.tangemcard.util.Util;
@@ -17,6 +16,8 @@ import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
 
 public class ServerApiTangem {
     private static String TAG = ServerApiTangem.class.getSimpleName();
@@ -37,7 +38,12 @@ public class ServerApiTangem {
     }
 
     public void cardVerifyAndGetInfo(TangemCard card) {
-        TangemApi tangemApi = App.getNetworkComponent().getRetrofitTangem().create(TangemApi.class);
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl("https://estimatefee.com/")
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+
+        TangemApi tangemApi = retrofit.create(TangemApi.class);
 
         List<CardVerifyAndGetInfo.Request.Item> requests = new ArrayList<>();
         requests.add(new CardVerifyAndGetInfo.Request.Item(Util.bytesToHex(card.getCID()), Util.bytesToHex(card.getCardPublicKey())));
@@ -82,7 +88,12 @@ public class ServerApiTangem {
     }
 
     public void requestArtwork(final String artworkId, final Date updateDate, TangemCard card) {
-        TangemApi tangemApi = App.getNetworkComponent().getRetrofitTangem().create(TangemApi.class);
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl("https://verify.tangem.com/")
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+
+        TangemApi tangemApi = retrofit.create(TangemApi.class);
 
         Call<ResponseBody> call = tangemApi.getArtwork(artworkId, Util.bytesToHex(card.getCID()), Util.bytesToHex(card.getCardPublicKey()));
         call.enqueue(new Callback<ResponseBody>() {
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/di/NetworkComponent.java b/tangemcard/src/main/java/com/tangem/tangemcard/di/NetworkComponent.java
deleted file mode 100644
index 09cfdf0b8f..0000000000
--- a/tangemcard/src/main/java/com/tangem/tangemcard/di/NetworkComponent.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.tangem.tangemcard.di;
-
-import com.tangem.tangemcard.data.network.Server;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import dagger.Component;
-import retrofit2.Retrofit;
-
-@Singleton
-@Component(modules = {NetworkModule.class})
-public interface NetworkComponent {
-
-    @Named(Server.ApiTangem.URL_TANGEM)
-    Retrofit getRetrofitTangem();
-
-}
\ No newline at end of file
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/di/NetworkModule.java b/tangemcard/src/main/java/com/tangem/tangemcard/di/NetworkModule.java
deleted file mode 100644
index 193acdf41e..0000000000
--- a/tangemcard/src/main/java/com/tangem/tangemcard/di/NetworkModule.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.tangem.tangemcard.di;
-
-import com.tangem.tangemcard.data.network.Server;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-import okhttp3.OkHttpClient;
-import okhttp3.logging.HttpLoggingInterceptor;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
-
-@Module
-class NetworkModule {
-
-    @Singleton
-    @Provides
-    @Named(Server.ApiTangem.URL_TANGEM)
-    Retrofit provideRetrofitTangem() {
-        return new Retrofit.Builder()
-                .baseUrl(Server.ApiTangem.URL_TANGEM)
-                .addConverterFactory(GsonConverterFactory.create())
-                .client(createOkHttpClient())
-                .build();
-    }
-
-    private OkHttpClient createOkHttpClient() {
-        return new OkHttpClient.Builder().
-                addInterceptor(createHttpLoggingInterceptor()).
-                build();
-    }
-
-    private HttpLoggingInterceptor createHttpLoggingInterceptor() {
-        HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
-        logging.setLevel(HttpLoggingInterceptor.Level.BODY);
-        return logging;
-    }
-
-
-}
\ No newline at end of file