diff --git a/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java b/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
index 84ddf44..779f6f8 100644
--- a/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
+++ b/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
@@ -45,15 +45,15 @@
 
     private final Retrofit retrofit;
     private static UserResource userResource;
-    private static final MutableLiveData<User> user   = new MutableLiveData<>();
-    private final MutableLiveData<String> token  = new MutableLiveData<>();
-    private final MutableLiveData<String> icon  = new MutableLiveData<>();
-    private final MutableLiveData<Boolean>loading = new MutableLiveData<>(false);
-    private static final MutableLiveData<String> error  = new MutableLiveData<>();
+    private static final MutableLiveData<User> user = new MutableLiveData<>();
+    private final MutableLiveData<String> token = new MutableLiveData<>();
+    private final MutableLiveData<String> icon = new MutableLiveData<>();
+    private final MutableLiveData<Boolean> loading = new MutableLiveData<>(false);
+    private static final MutableLiveData<String> error = new MutableLiveData<>();
 
 
     //コンストラクタ
-    public UserViewModel(){
+    public UserViewModel() {
         this.retrofit = new Retrofit.Builder()
                 .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/tampopo/")
                 .addConverterFactory(ScalarsConverterFactory.create())
@@ -62,11 +62,25 @@
         this.userResource = retrofit.create(UserResource.class);
     }
 
-    public LiveData<User> getUser()   { return user;   }
-    public LiveData<String> getToken()  { return token;  }
-    public LiveData<String> getIcon()  { return icon;  }
-    public LiveData<Boolean>isLoading() { return loading;}
-    public static LiveData<String> getError()  { return error;  }
+    public LiveData<User> getUser() {
+        return user;
+    }
+
+    public LiveData<String> getToken() {
+        return token;
+    }
+
+    public LiveData<String> getIcon() {
+        return icon;
+    }
+
+    public LiveData<Boolean> isLoading() {
+        return loading;
+    }
+
+    public static LiveData<String> getError() {
+        return error;
+    }
 
     //新規登録　enqueueで非同期処理、Callbackで成功失敗の処理、LiveDataに反映
     //サーバーから返ってきた型と合わせないとFailureに流れる
@@ -74,7 +88,8 @@
     public void createUser(String id, String password) {
         loading.setValue(true);
         userResource.createUser(id, password).enqueue(new Callback<User>() {
-            @Override public void onResponse(Call<User> c, Response<User> res) {
+            @Override
+            public void onResponse(Call<User> c, Response<User> res) {
                 loading.setValue(false);
                 if (res.isSuccessful()) {
                     User u = res.body();
@@ -83,7 +98,9 @@
                     error.setValue("登録失敗: " + res.code());
                 }
             }
-            @Override public void onFailure(Call<User> c, Throwable t) {
+
+            @Override
+            public void onFailure(Call<User> c, Throwable t) {
                 loading.setValue(false);
                 error.setValue("エラー: " + t.getMessage());
             }
@@ -94,7 +111,8 @@
     public void login(String id, String password) {
         loading.setValue(true);
         userResource.login(id, password).enqueue(new Callback<String>() {
-            @Override public void onResponse(Call<String> c, Response<String> res) {
+            @Override
+            public void onResponse(Call<String> c, Response<String> res) {
                 loading.setValue(false);
                 if (res.isSuccessful()) {
                     userResource.getUser(id);
@@ -104,12 +122,15 @@
                     error.setValue("ログイン失敗: " + res.code());
                 }
             }
-            @Override public void onFailure(Call<String> c, Throwable t) {
+
+            @Override
+            public void onFailure(Call<String> c, Throwable t) {
                 loading.setValue(false);
                 error.setValue("エラー: " + t.getMessage());
             }
         });
     }
+
     //ニックネーム
     public String getNickname(String id) {
         Call<String> call = userResource.getName(id);
@@ -129,8 +150,8 @@
 //
     }
 
-    //アイコン
-    public String getIcon(String id) {
+    //フレンドのアイコンをとってくる
+    public String getFriendIcon(String id) {
         Call<String> call = userResource.getIcon(id);
         try {
             Response<String> response = call.execute();
@@ -138,7 +159,6 @@
             if (response.isSuccessful()) {
                 System.out.println(response.code());
                 String iconUrl = response.body();
-                icon.postValue(iconUrl);
                 return iconUrl;
             } else {
                 System.out.println(response.code());
@@ -163,7 +183,14 @@
 //        });
     }
 
-    //アイコン（非同期）
+    //アイコン（非同期）idはログインユーザーのuser-id
+
+    /**
+     * 自身のアイコンを取ってくる
+     *
+     * @param id ログインユーザーのuser-id
+     * @deprecated
+     */
     public void getIconAsync(String id) {
         Call<String> call = userResource.getIcon(id);
         call.enqueue(new Callback<String>() {
@@ -182,6 +209,31 @@
         });
     }
 
+    /**
+     * 自身のアイコンを取ってくる
+     */
+    public void getMyIcon(String id) {
+//        User currentUser = user.getValue();
+//        if (currentUser == null) {
+//            return;
+//        }
+        Call<String> call = userResource.getIcon(id);
+        call.enqueue(new Callback<String>() {
+            @Override
+            public void onResponse(Call<String> call, Response<String> response) {
+                if (response.isSuccessful()) {
+                    String iconUrl = response.body();
+                    icon.postValue(iconUrl);
+                }
+            }
+
+            @Override
+            public void onFailure(Call<String> call, Throwable t) {
+                Log.e("UserViewModel", "Error");
+            }
+        });
+    }
+
 
     public void updateIcon(String id, String newIcon, String token) {
         Call<String> call = userResource.updateIcon(id, newIcon, token);
@@ -196,7 +248,9 @@
                     System.out.println(response.code());
                 }
             }
-            @Override public void onFailure(Call<String> call, Throwable t) {
+
+            @Override
+            public void onFailure(Call<String> call, Throwable t) {
                 System.out.println("エラー: " + t.getMessage());
             }
         });
@@ -229,11 +283,12 @@
             }
         });
     }
+
     //パスワードの変更（市井）
-    public void updatePassword(String userId, String newPassword ,String tokenValue) {
+    public void updatePassword(String userId, String newPassword, String tokenValue) {
         loading.setValue(true);
 
-        userResource.updatePassword(userId, newPassword ,tokenValue).enqueue(new Callback<Void>() {
+        userResource.updatePassword(userId, newPassword, tokenValue).enqueue(new Callback<Void>() {
             @Override
             public void onResponse(Call<Void> call, Response<Void> response) {
                 loading.setValue(false);
@@ -288,8 +343,6 @@
     }
 
 
-
-
     //viewModelのところでを呼び出すがフレンド系は西村さんの方で管理する
 
 }